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@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()
automation@ovirt.org has posted comments on this change.
Change subject: StorageDomainManifest: Move imageGarbageCollector ......................................................................
Patch Set 1:
* Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
automation@ovirt.org has posted comments on this change.
Change subject: StorageDomainManifest: Move imageGarbageCollector ......................................................................
Patch Set 2:
* Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
automation@ovirt.org has posted comments on this change.
Change subject: StorageDomainManifest: Move imageGarbageCollector ......................................................................
Patch Set 3:
* Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
automation@ovirt.org has posted comments on this change.
Change subject: StorageDomainManifest: Move imageGarbageCollector ......................................................................
Patch Set 4:
* Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
Jenkins CI RO has abandoned this change.
Change subject: StorageDomainManifest: Move imageGarbageCollector ......................................................................
Abandoned
Abandoned due to no activity - please restore if still relevant
gerrit-hooks has posted comments on this change.
Change subject: StorageDomainManifest: Move imageGarbageCollector ......................................................................
Patch Set 4:
* Update tracker: IGNORE, no Bug-Url found
vdsm-patches@lists.fedorahosted.org