Change in vdsm[master]: storage: Factor out getAllVolumes - vdsm-patches - Fedora mailing-lists

28 Apr 2015

Adam Litke has uploaded a new change for review.
Change subject: storage: Factor out getAllVolumes
......................................................................
storage: Factor out getAllVolumes
The SDM garbage collector needs to a mapping of volumes by imageID.
Factor out this logic from getAllVolumes so it can be reused later.
Change-Id: If8c55edf6416dddc4a4f30b91422b3e968df2b99
Signed-off-by: Adam Litke alitke@redhat.com
---
M vdsm/storage/fileSD.py
1 file changed, 17 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/77/40377/1

diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py
index 1220939..042f836 100644
--- a/vdsm/storage/fileSD.py
+++ b/vdsm/storage/fileSD.py
@@ -18,7 +18,6 @@
 # Refer to the README and COPYING files for full details of the license
 #
-import collections
 import os
 import errno
 import logging
@@ -405,6 +404,21 @@
         """
         pass
+    def getImageToVolumesMap(self):
+        volMetaPattern = os.path.join(self.mountpoint, self.sdUUID,
+                                      sd.DOMAIN_IMAGES, "*", "*.meta")
+        volMetaPaths = self.oop.glob.glob(volMetaPattern)
+        images = {}
+        for metaPath in volMetaPaths:
+            head, tail = os.path.split(metaPath)
+            volUUID, volExt = os.path.splitext(tail)
+            imgUUID = os.path.basename(head)
+            try:
+                images[imgUUID].append(volUUID)
+            except KeyError:
+                images[imgUUID] = [volUUID]
+        return images
+
     def getAllVolumes(self):
         """
         Return dict {volUUID: ((imgUUIDs,), parentUUID)} of the domain.
@@ -422,17 +436,8 @@
         Template volumes have no parent, and thus we report BLANK_UUID as their
         parentUUID.
         """
-        volMetaPattern = os.path.join(self.mountpoint, self.sdUUID,
-                                      sd.DOMAIN_IMAGES, "*", "*.meta")
-        volMetaPaths = self.oop.glob.glob(volMetaPattern)
-
-        # First create mapping from images to volumes
-        images = collections.defaultdict(list)
-        for metaPath in volMetaPaths:
-            head, tail = os.path.split(metaPath)
-            volUUID, volExt = os.path.splitext(tail)
-            imgUUID = os.path.basename(head)
-            images[imgUUID].append(volUUID)
+        # First get the mapping from images to volumes
+        images = self.getImageToVolumesMap()
# Using images to volumes mapping, we can create volumes to images
         # mapping, detecting template volumes and template images, based on
-- 
To view, visit https://gerrit.ovirt.org/40377
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If8c55edf6416dddc4a4f30b91422b3e968df2b99
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke alitke@redhat.com

    