[NEW PATCH] BZ#717658 - Change format signature. (via gerrit-bot)
Eduardo Warszawski
ewarszaw at redhat.com
Fri Jul 1 09:49:44 UTC 2011
New patch submitted by Eduardo Warszawski (ewarszaw at redhat.com)
You can review this change at: http://gerrit.usersys.redhat.com/640
commit a609d198d38137374db72a7ac3fc416c36ad64d3
Author: Eduardo Warszawski <ewarszaw at redhat.com>
Date: Thu Jun 30 16:07:58 2011 +0300
BZ#717658 - Change format signature.
Change-Id: Iea1e5735563087195181c625e57b8ba8e75d3441
diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py
index 214e8a4..5c8f8e2 100644
--- a/vdsm/storage/blockSD.py
+++ b/vdsm/storage/blockSD.py
@@ -658,11 +658,12 @@ class BlockStorageDomain(sd.StorageDomain):
fileUtils.cleanupdir(os.path.join("/dev", self.sdUUID))
@classmethod
- def format(cls, sdUUID, domaindir):
+ def format(cls, sdUUID):
"""Format detached storage domain.
This removes all data from the storage domain.
"""
# Remove the directory tree
+ domaindir = cls.findDomainPath(sdUUID)
fileUtils.cleanupdir(domaindir, ignoreErrors = True)
# Remove special metadata and service volumes
# Remove all volumes LV if exists
diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py
index 8b40a59..023c197 100644
--- a/vdsm/storage/fileSD.py
+++ b/vdsm/storage/fileSD.py
@@ -195,12 +195,13 @@ class FileStorageDomain(sd.StorageDomain):
return imgList
@classmethod
- def format(cls, sdUUID, domaindir):
+ def format(cls, sdUUID):
"""
Format detached storage domain.
This removes all data from the storage domain.
"""
cls.log.info("Formating domain %s", sdUUID)
+ domaindir = cls.findDomainPath(sdUUID)
processPoolDict[sdUUID].fileUtils.cleanupdir(domaindir, ignoreErrors = False)
return True
diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py
index 325da5d..579b282 100644
--- a/vdsm/storage/sd.py
+++ b/vdsm/storage/sd.py
@@ -552,14 +552,6 @@ class StorageDomain:
if self.isBackup():
self.unmountMaster()
-
- def format(self):
- """
- Format detached storage domain.
- This removes all data from the storage domain.
- """
- pass
-
def getAllImages(self):
"""
Fetch the list of the Image UUIDs
diff --git a/vdsm/storage/sdf.py b/vdsm/storage/sdf.py
index da8335c..16faa3e 100644
--- a/vdsm/storage/sdf.py
+++ b/vdsm/storage/sdf.py
@@ -81,13 +81,13 @@ class StorageDomainFactory:
for domClass in (blockSD.BlockStorageDomain, nfsSD.NfsStorageDomain, localFsSD.LocalFsStorageDomain):
try:
- domaindir = domClass.findDomainPath(sdUUID)
+ domClass.findDomainPath(sdUUID)
except (se.StorageDomainDoesNotExist):
pass
except Exception:
cls.log.error("Can't find out domain %s", sdUUID, exc_info=True)
else:
- return domClass.format(sdUUID, domaindir)
+ return domClass.format(sdUUID)
raise se.StorageDomainTypeError(sdUUID)
More information about the vdsm-patches
mailing list