[PATCH master 3/3] Remove MarkInstanceDisksActive's config lock

['BSRK Aditya' via ganeti-devel]

MarkInstanceDisksActive is used by instance migration

Signed-off-by: BSRK Aditya <b...@google.com>
---
 lib/config/__init__.py |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/config/__init__.py b/lib/config/__init__.py
index 61e5c20..d9e5c6c 100644
--- a/lib/config/__init__.py
+++ b/lib/config/__init__.py
@@ -1893,7 +1893,6 @@ class ConfigWriter(object):
     self._SetInstanceStatus(inst_uuid, constants.ADMINST_DOWN, None,
                             constants.USER_SOURCE)
 
-  @ConfigSync()
   def MarkInstanceDisksActive(self, inst_uuid):
     """Mark the status of instance disks active.
 
@@ -1901,7 +1900,15 @@ class ConfigWriter(object):
     @return: the updated instance object
 
     """
-    return self._SetInstanceStatus(inst_uuid, None, True, None)
+    def WithRetry():
+      result = self._wconfd.MarkInstanceDisksActive(inst_uuid)
+      self.OutDate()
+
+      if result is None:
+        raise utils.RetryAgain()
+      else:
+        return result
+    return objects.Instance.FromDict(utils.Retry(WithRetry, 0.1, 30))
 
   @ConfigSync()
   def MarkInstanceDisksInactive(self, inst_uuid):
-- 
1.7.10.4