Nir Soffer has uploaded a new change for review.
Change subject: rsourceFactories: Use new resourceManager module api
......................................................................
rsourceFactories: Use new resourceManager module api
Replace usage of getInstance with direct module access.
Change-Id: Icdb30f34257f31622a87d1f496b3f516803eeda8
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
---
M vdsm/storage/resourceFactories.py
1 file changed, 3 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/65036/1
diff --git a/vdsm/storage/resourceFactories.py b/vdsm/storage/resourceFactories.py
index bf8e498..4126db8 100644
--- a/vdsm/storage/resourceFactories.py
+++ b/vdsm/storage/resourceFactories.py
@@ -31,8 +31,6 @@
import sd
import image
-rmanager = rm.ResourceManager.getInstance()
-
log = logging.getLogger('storage.ResourcesFactories')
@@ -152,12 +150,12 @@
try:
if template:
if len(volUUIDChain) > 0:
- volRes = rmanager.acquireResource(
+ volRes = rm.acquireResource(
self.volumeResourcesNamespace,
template, rm.SHARED,
timeout=self.resource_default_timeout)
else:
- volRes = rmanager.acquireResource(
+ volRes = rm.acquireResource(
self.volumeResourcesNamespace,
template, lockType,
timeout=self.resource_default_timeout)
@@ -165,7 +163,7 @@
# Acquire 'lockType' volume locks
for volUUID in volUUIDChain:
- volRes = rmanager.acquireResource(
+ volRes = rm.acquireResource(
self.volumeResourcesNamespace,
volUUID, lockType,
timeout=self.resource_default_timeout)
--
To view, visit
https://gerrit.ovirt.org/65036
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icdb30f34257f31622a87d1f496b3f516803eeda8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>