On Mon, Jun 22, 2015 at 04:29:56PM +0200, 'Klaus Aehlig' via ganeti-devel wrote:
...as they now do not behave differently any more.
Signed-off-by: Klaus Aehlig <[email protected]>
---
lib/config/__init__.py | 17 +----------------
test/py/testutils/config_mock.py | 6 +++---
2 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/lib/config/__init__.py b/lib/config/__init__.py
index d35ef24..9feea7a 100644
--- a/lib/config/__init__.py
+++ b/lib/config/__init__.py
@@ -1168,7 +1168,7 @@ class ConfigWriter(object):
node_uuids, result)
return result
- def _UnlockedReleaseDRBDMinors(self, disk_uuid):
+ def ReleaseDRBDMinors(self, disk_uuid):
"""Release temporary drbd minors allocated for a given disk.
This is just a wrapper over a call to WConfd.
@@ -1185,21 +1185,6 @@ class ConfigWriter(object):
if not self._offline:
self._wconfd.ReleaseDRBDMinors(disk_uuid)
- def ReleaseDRBDMinors(self, disk_uuid):
- """Release temporary drbd minors allocated for a given disk.
-
- This should be called on the error paths, on the success paths
- it's automatically called by the ConfigWriter add and update
- functions.
-
- This function is just a wrapper over L{_UnlockedReleaseDRBDMinors}.
-
- @type disk_uuid: string
- @param disk_uuid: the disk for which temporary minors should be released
-
- """
- self._UnlockedReleaseDRBDMinors(disk_uuid)
-
@ConfigSync(shared=1)
def GetInstanceDiskTemplate(self, inst_uuid):
"""Return the disk template of an instance.
diff --git a/test/py/testutils/config_mock.py b/test/py/testutils/config_mock.py
index c9cc10d..7ae27bc 100644
--- a/test/py/testutils/config_mock.py
+++ b/test/py/testutils/config_mock.py
@@ -609,7 +609,7 @@ class ConfigMock(config.ConfigWriter):
def AllocateDRBDMinor(self, node_uuids, disk_uuid):
return map(lambda _: 0, node_uuids)
- def _UnlockedReleaseDRBDMinors(self, disk_uuid):
+ def ReleaseDRBDMinors(self, disk_uuid):
pass
def SetIPolicyField(self, category, field, value):
@@ -867,14 +867,14 @@ class ConfigMock(config.ConfigWriter):
instance.ctime = instance.mtime = time.time()
self._ConfigData().instances[instance.uuid] = instance
self._ConfigData().cluster.serial_no += 1 # pylint: disable=E1103
- self._UnlockedReleaseDRBDMinors(instance.uuid)
+ self.ReleaseDRBDMinors(instance.uuid)
self._UnlockedCommitTemporaryIps(ec_id)
def _UnlockedAddDisk(self, disk):
disk.UpgradeConfig()
self._ConfigData().disks[disk.uuid] = disk
self._ConfigData().cluster.serial_no += 1 # pylint: disable=E1103
- self._UnlockedReleaseDRBDMinors(disk.uuid)
+ self.ReleaseDRBDMinors(disk.uuid)
def _UnlockedAttachInstanceDisk(self, inst_uuid, disk_uuid, idx=None):
instance = self._UnlockedGetInstanceInfo(inst_uuid)
--
2.4.3.573.g4eafbef
LGTM
