openstack/deb-cinder
Code Issues Proposed changes

Disable multi-attach for RBD

Browse Source 
This is not really safe to turn on yet, as there
are RBD features which are incompatible with
multi-attach that must be managed from Cinder.

Disable multi-attach for now until code to handle
that is ready.

Change-Id: I17da2f4e897178762d1c3d1302d2d79ae28e349c
Related-Bug: #1519227
Partial-Bug: #1535815
This commit is contained in:
Eric Harney 2016-02-23 11:51:40 -05:00
parent 09134ba4f3
commit 59a22e3d3e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/tests/unit/test_rbd.py
View File

@ -773,7 +773,7 @@ class RBDTestCase(test.TestCase):
total_capacity_gb=27, total_capacity_gb=27,
free_capacity_gb=26, free_capacity_gb=26,
reserved_percentage=0, reserved_percentage=0,
multiattach=True) multiattach=False)
actual = self.driver.get_volume_stats(True) actual = self.driver.get_volume_stats(True)
client.cluster.mon_command.assert_called_once_with( client.cluster.mon_command.assert_called_once_with(
@ -799,7 +799,7 @@ class RBDTestCase(test.TestCase):
total_capacity_gb='unknown', total_capacity_gb='unknown',
free_capacity_gb='unknown', free_capacity_gb='unknown',
reserved_percentage=0, reserved_percentage=0,
multiattach=True) multiattach=False)
actual = self.driver.get_volume_stats(True) actual = self.driver.get_volume_stats(True)
client.cluster.mon_command.assert_called_once_with( client.cluster.mon_command.assert_called_once_with(

2
cinder/volume/drivers/rbd.py
View File

@ -388,7 +388,7 @@ class RBDDriver(driver.TransferVD, driver.ExtendVD,
'total_capacity_gb': 'unknown', 'total_capacity_gb': 'unknown',
'free_capacity_gb': 'unknown', 'free_capacity_gb': 'unknown',
'reserved_percentage': 0, 'reserved_percentage': 0,
'multiattach': True, 'multiattach': False,
} }
backend_name = self.configuration.safe_get('volume_backend_name') backend_name = self.configuration.safe_get('volume_backend_name')
stats['volume_backend_name'] = backend_name or 'RBD' stats['volume_backend_name'] = backend_name or 'RBD'