New patch submitted by Eduardo Warszawski (ewarszaw(a)redhat.com)
You can review this change at:
http://gerrit.usersys.redhat.com/659
commit 59a64954b5dcab5e37d762452bc0eb18722268dc
Author: Eduardo Warszawski <ewarszaw(a)redhat.com>
Date: Tue Jul 5 15:32:53 2011 +0300
formatStorageDomain removes the VG too.
Change-Id: Ie993abd2a812f1ecec127cc637794994591e48ea
diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py
index 9f744b2..06e67b3 100644
--- a/vdsm/storage/blockSD.py
+++ b/vdsm/storage/blockSD.py
@@ -679,8 +679,7 @@ class BlockStorageDomain(sd.StorageDomain):
except se.CannotRemoveLogicalVolume, e:
cls.log.warning("Remove logical volume failed %s/%s %s",
sdUUID, lv.name, str(e))
- # Remove SD tag
- lvm.replaceVGTag(sdUUID, STORAGE_DOMAIN_TAG, STORAGE_UNREADY_DOMAIN_TAG)
+ lvm.removeVG(sdUUID)
return True
def getInfo(self):
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 7081558..11c32dc 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -828,6 +828,7 @@ class HSM:
return dict(uuid=lvm.getVG(vgname).uuid)
+ #DEPRECATED: formatSD effectively removes the VG.
def public_removeVG(self, vgUUID, options = None):
"""
Removes a volume group.
@@ -835,12 +836,13 @@ class HSM:
:param vgUUID: The UUID of the VG you want removed.
:type vgUUID: UUID
:param options: ?
-
- :raises: :exc:`storage_exception.VolumeGroupDoesNotExist` if no VG with this UUID
exists.
"""
vars.task.setDefaultException(se.VolumeGroupActionError("%s" %
str(vgUUID)))
#getSharedLock(connectionsResource...)
- lvm.removeVGbyUUID(vgUUID)
+ try:
+ lvm.removeVGbyUUID(vgUUID)
+ except se.VolumeGroupDoesNotExist:
+ pass
def public_getTaskStatus(self, taskID, spUUID=None, options = None):