[NEW PATCH] Related to BZ#712106 - Get rid from redundant instance of rmanager (via gerrit-bot)
Igor Lvovsky
ilvovsky at redhat.com
Tue Jun 28 17:07:37 UTC 2011
New patch submitted by Igor Lvovsky (ilvovsky at redhat.com)
You can review this change at: http://gerrit.usersys.redhat.com/629
commit e867d09e6a1a6be24f282c3997e6b8675a6c5303
Author: Igor Lvovsky <ilvovsky at redhat.com>
Date: Tue Jun 21 13:57:38 2011 +0300
Related to BZ#712106 - Get rid from redundant instance of rmanager
Change-Id: I4ac15a45e0716a78be24b322e0a2b6d4d6035d3d
diff --git a/vdsm/storage/spm.py b/vdsm/storage/spm.py
index 085d03b..3596123 100644
--- a/vdsm/storage/spm.py
+++ b/vdsm/storage/spm.py
@@ -40,9 +40,7 @@ from resourceFactories import IMAGE_NAMESPACE
import resourceManager as rm
from contextlib import nested
import fileUtils
-from resourceManager import ResourceManager, LockType
from processPool import Timeout
-rmanager = ResourceManager.getInstance()
# Global operation definitions
NOOP = 1
@@ -352,7 +350,7 @@ class SPM:
return {"upgradeStatus" : "started"}
def _upgradePool(self, spUUID, targetDomVersion):
- with rmanager.acquireResource(STORAGE, "upgrade_" + spUUID, LockType.exclusive):
+ with rmanager.acquireResource(STORAGE, "upgrade_" + spUUID, rm.LockType.exclusive):
if len(self._domainsToUpgrade) > 0:
raise se.PoolUpgradeInProgress(spUUID)
@@ -361,7 +359,7 @@ class SPM:
masterDom = pool.getMasterDomain()
sdUUID = masterDom.sdUUID
self.log.info("Trying to upgrade master domain `%s`", sdUUID)
- with rmanager.acquireResource(STORAGE, masterDom.sdUUID, LockType.exclusive):
+ with rmanager.acquireResource(STORAGE, masterDom.sdUUID, rm.LockType.exclusive):
masterDom.upgrade(targetDomVersion)
self.log.debug("Marking all domains for upgrade")
@@ -401,8 +399,8 @@ class SPM:
self.log.error("Error while preparing domain `%s` upgrade", sdUUID, exc_info=True)
return
- with rmanager.acquireResource(STORAGE, "upgrade_" + sdUUID, LockType.exclusive):
- with rmanager.acquireResource(STORAGE, sdUUID, LockType.exclusive):
+ with rmanager.acquireResource(STORAGE, "upgrade_" + sdUUID, rm.LockType.exclusive):
+ with rmanager.acquireResource(STORAGE, sdUUID, rm.LockType.exclusive):
if sdUUID not in self._domainsToUpgrade:
return
@@ -623,7 +621,7 @@ class SPM:
"""
Stop SPM
"""
- with rmanager.acquireResource(STORAGE, "upgrade_" + spUUID, LockType.exclusive):
+ with rmanager.acquireResource(STORAGE, "upgrade_" + spUUID, rm.LockType.exclusive):
domains = self._domainsToUpgrade
try:
sp.StatsThread.onDomainConnectivityStateChange.unregister(self._upgradePoolDomain)
@@ -640,7 +638,7 @@ class SPM:
res.release()
for sdUUID in domains:
- req = rmanager.registerResource(STORAGE, "upgrade_" + sdUUID, LockType.exclusive, partial(cancelUpgrade, sdUUID))
+ req = rmanager.registerResource(STORAGE, "upgrade_" + sdUUID, rm.LockType.exclusive, partial(cancelUpgrade, sdUUID))
requests.append(req)
for req in requests:
More information about the vdsm-patches
mailing list