Eduardo has uploaded a new change for review.
Change subject: Avoid hsm image deletions. ......................................................................
Avoid hsm image deletions.
This code was introduced to fix BZ#560389. The bug was in Image.delete() which was already removed.
Related to BZ#965184.
Change-Id: Ie1ec2ea8793a4ad63453559bc5f663b65f9b9336 Signed-off-by: Eduardo ewarszaw@redhat.com --- M vdsm/storage/blockSD.py M vdsm/storage/fileSD.py M vdsm/storage/sd.py 3 files changed, 0 insertions(+), 24 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/93/17193/1
diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index 72b3ef0..6507cbf 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -416,7 +416,6 @@ # _extendlock is used to prevent race between # VG extend and LV extend. self._extendlock = threading.Lock() - self.imageGarbageCollector() self._registerResourceNamespaces() self._lastUncachedSelftest = 0
diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py index 1651825..0042aab 100644 --- a/vdsm/storage/fileSD.py +++ b/vdsm/storage/fileSD.py @@ -165,7 +165,6 @@
if not self.oop.fileUtils.pathExists(self.metafile): raise se.StorageDomainMetadataNotFound(sdUUID, self.metafile) - self.imageGarbageCollector() self._registerResourceNamespaces()
@property @@ -515,20 +514,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 fd79059..c764d2d 100644 --- a/vdsm/storage/sd.py +++ b/vdsm/storage/sd.py @@ -786,11 +786,3 @@
def isData(self): return self.getMetaParam(DMDK_CLASS) == DATA_DOMAIN - - 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