Change in vdsm[master]: StorageDomainManifest: move refresh and refreshDirTree

alitke at redhat.com alitke at redhat.com
Wed Aug 26 20:47:34 UTC 2015


Adam Litke has uploaded a new change for review.

Change subject: StorageDomainManifest: move refresh and refreshDirTree
......................................................................

StorageDomainManifest: move refresh and refreshDirTree

Change-Id: I933ee449816b1f1d7352c3795e202d8dd0c4b185
Signed-off-by: Adam Litke <alitke at redhat.com>
---
M tests/sdm_indirection_tests.py
M vdsm/storage/blockSD.py
M vdsm/storage/sd.py
3 files changed, 39 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/88/45388/1

diff --git a/tests/sdm_indirection_tests.py b/tests/sdm_indirection_tests.py
index ac8e263..b4074d6 100644
--- a/tests/sdm_indirection_tests.py
+++ b/tests/sdm_indirection_tests.py
@@ -148,6 +148,14 @@
     def hasVolumeLeases(self):
         pass
 
+    @recorded
+    def refreshDirTree(self):
+        pass
+
+    @recorded
+    def refresh(self):
+        pass
+
 
 class FakeBlockDomainManifest(FakeDomainManifest):
     def __init__(self):
@@ -341,6 +349,8 @@
         ['hasHostId', 1],
         ['getHostStatus', 1],
         ['hasVolumeLeases', 0],
+        ['refreshDirTree', 0],
+        ['refresh', 0],
         ])
     def test_common_functions(self, fn, nargs):
         self.check_call(fn, nargs)
diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py
index 19db3f0..2cbc77c 100644
--- a/vdsm/storage/blockSD.py
+++ b/vdsm/storage/blockSD.py
@@ -683,6 +683,27 @@
             images.update(imgs)
         return images
 
+    def refreshDirTree(self):
+        # create domain images folder
+        imagesPath = os.path.join(self.domaindir, sd.DOMAIN_IMAGES)
+        fileUtils.createdir(imagesPath)
+
+        # create domain special volumes folder
+        domMD = os.path.join(self.domaindir, sd.DOMAIN_META_DATA)
+        fileUtils.createdir(domMD)
+
+        lvm.activateLVs(self.sdUUID, SPECIAL_LVS)
+        for lvName in SPECIAL_LVS:
+            dst = os.path.join(domMD, lvName)
+            if not os.path.lexists(dst):
+                src = lvm.lvPath(self.sdUUID, lvName)
+                self.log.debug("Creating symlink from %s to %s", src, dst)
+                os.symlink(src, dst)
+
+    def refresh(self):
+        self.refreshDirTree()
+        lvm.invalidateVG(self.sdUUID)
+        self.replaceMetadata(selectMetadata(self.sdUUID))
 
 class BlockStorageDomain(sd.StorageDomain):
     manifestClass = BlockStorageDomainManifest
@@ -1343,30 +1364,8 @@
         # It is time to deactivate the master LV now
         lvm.deactivateLVs(self.sdUUID, MASTERLV)
 
-    def refreshDirTree(self):
-        # create domain images folder
-        imagesPath = os.path.join(self.domaindir, sd.DOMAIN_IMAGES)
-        fileUtils.createdir(imagesPath)
-
-        # create domain special volumes folder
-        domMD = os.path.join(self.domaindir, sd.DOMAIN_META_DATA)
-        fileUtils.createdir(domMD)
-
-        lvm.activateLVs(self.sdUUID, SPECIAL_LVS)
-        for lvName in SPECIAL_LVS:
-            dst = os.path.join(domMD, lvName)
-            if not os.path.lexists(dst):
-                src = lvm.lvPath(self.sdUUID, lvName)
-                self.log.debug("Creating symlink from %s to %s", src, dst)
-                os.symlink(src, dst)
-
     def extendVolume(self, volumeUUID, size, isShuttingDown=None):
         return self._manifest.extendVolume(volumeUUID, size, isShuttingDown)
-
-    def refresh(self):
-        self.refreshDirTree()
-        lvm.invalidateVG(self.sdUUID)
-        self.replaceMetadata(selectMetadata(self.sdUUID))
 
     @staticmethod
     def findDomainPath(sdUUID):
diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py
index 3ad444c..6145ab0 100644
--- a/vdsm/storage/sd.py
+++ b/vdsm/storage/sd.py
@@ -439,6 +439,12 @@
         return clusterLockClass(self.sdUUID, self.getIdsFilePath(),
                                 self.getLeasesFilePath(), *leaseParams)
 
+    def refreshDirTree(self):
+        pass
+
+    def refresh(self):
+        pass
+
 
 class StorageDomain(object):
     log = logging.getLogger("Storage.StorageDomain")
@@ -910,10 +916,10 @@
         self.setMetaParams({key: value})
 
     def refreshDirTree(self):
-        pass
+        self._manifest.refreshDirTree()
 
     def refresh(self):
-        pass
+        self._manifest.refresh()
 
     def extend(self, devlist, force):
         pass


-- 
To view, visit https://gerrit.ovirt.org/45388
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I933ee449816b1f1d7352c3795e202d8dd0c4b185
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <alitke at redhat.com>


More information about the vdsm-patches mailing list