Change in vdsm[master]: StorageDomainManifest: Move imageGarbageCollector

alitke at redhat.com alitke at redhat.com
Fri Aug 7 15:38:47 UTC 2015


Adam Litke has uploaded a new change for review.

Change subject: StorageDomainManifest: Move imageGarbageCollector
......................................................................

StorageDomainManifest: Move imageGarbageCollector

Change-Id: I6d608bed1a7add239aca3ffe96d9e9a118799511
Signed-off-by: Adam Litke <alitke at redhat.com>
---
M vdsm/storage/fileSD.py
M vdsm/storage/sd.py
2 files changed, 23 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/70/44570/1

diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py
index 2508216..2e828c3 100644
--- a/vdsm/storage/fileSD.py
+++ b/vdsm/storage/fileSD.py
@@ -325,6 +325,20 @@
             return leasePath, fileVolume.LEASE_FILEOFFSET
         return None, None
 
+    def imageGarbageCollector(self):
+        """
+        Image Garbage Collector
+        remove the remnants of the removed images (they could be left sometimes
+        (on NFS mostly) due to lazy file removal
+        """
+        removedPattern = os.path.join(self.domaindir, sd.DOMAIN_IMAGES,
+                                      sd.REMOVED_IMAGE_PREFIX + '*')
+        removedImages = self.oop.glob.glob(removedPattern)
+        self.log.debug("Removing remnants of deleted images %s" %
+                       removedImages)
+        for imageDir in removedImages:
+            self.oop.fileUtils.cleanupdir(imageDir)
+
 
 class FileStorageDomain(sd.StorageDomain):
     manifestClass = FileStorageDomainManifest
@@ -639,20 +653,6 @@
                 mount.getMountFromTarget(self.mountpoint).umount()
                 raise se.FileStorageDomainStaleNFSHandle()
             raise
-
-    def imageGarbageCollector(self):
-        """
-        Image Garbage Collector
-        remove the remnants of the removed images (they could be left sometimes
-        (on NFS mostly) due to lazy file removal
-        """
-        removedPattern = os.path.join(self.domaindir, sd.DOMAIN_IMAGES,
-                                      sd.REMOVED_IMAGE_PREFIX + '*')
-        removedImages = self.oop.glob.glob(removedPattern)
-        self.log.debug("Removing remnants of deleted images %s" %
-                       removedImages)
-        for imageDir in removedImages:
-            self.oop.fileUtils.cleanupdir(imageDir)
 
     def templateRelink(self, imgUUID, volUUID):
         """
diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py
index 5635e46..1ddcd45 100644
--- a/vdsm/storage/sd.py
+++ b/vdsm/storage/sd.py
@@ -470,6 +470,14 @@
         if preallocate is not None and preallocate not in volume.VOL_TYPE:
             raise se.IncorrectType(preallocate)
 
+    def imageGarbageCollector(self):
+        """
+        Image Garbage Collector
+        remove the remnants of the removed images (they could be left sometimes
+        (on NFS mostly) due to lazy file removal
+        """
+        pass
+
 
 class StorageDomain(object):
     log = logging.getLogger("Storage.StorageDomain")
@@ -964,9 +972,4 @@
         return self._manifest.isData()
 
     def imageGarbageCollector(self):
-        """
-        Image Garbage Collector
-        remove the remnants of the removed images (they could be left sometimes
-        (on NFS mostly) due to lazy file removal
-        """
-        pass
+        self._manifest.imageGarbageCollector()


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d608bed1a7add239aca3ffe96d9e9a118799511
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