Change in vdsm[master]: VolumeMetadata: move validateDelete
alitke at redhat.com
alitke at redhat.com
Fri Jun 5 20:57:12 UTC 2015
Adam Litke has uploaded a new change for review.
Change subject: VolumeMetadata: move validateDelete
......................................................................
VolumeMetadata: move validateDelete
Change-Id: I06c8a87cb5b07d342b47fc54e75bc54ba00f5be2
Signed-off-by: Adam Litke <alitke at redhat.com>
---
M vdsm/storage/blockVolume.py
M vdsm/storage/fileVolume.py
M vdsm/storage/volume.py
3 files changed, 20 insertions(+), 20 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/00/42000/1
diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py
index 82f74bc..73b6a5e 100644
--- a/vdsm/storage/blockVolume.py
+++ b/vdsm/storage/blockVolume.py
@@ -393,7 +393,7 @@
self.recheckIfLeaf()
if not force:
- self.validateDelete()
+ self.md.validateDelete()
# Mark volume as illegal before deleting
self.setLegality(volume.ILLEGAL_VOL)
diff --git a/vdsm/storage/fileVolume.py b/vdsm/storage/fileVolume.py
index 7956ad4..cfd05f8 100644
--- a/vdsm/storage/fileVolume.py
+++ b/vdsm/storage/fileVolume.py
@@ -314,7 +314,7 @@
lease_path = self.__leaseVolumePath(vol_path)
if not force:
- self.validateDelete()
+ self.md.validateDelete()
# Mark volume as illegal before deleting
self.setLegality(volume.ILLEGAL_VOL)
diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py
index d2dbd3c..abbd906 100644
--- a/vdsm/storage/volume.py
+++ b/vdsm/storage/volume.py
@@ -412,6 +412,24 @@
def setFormat(self, volFormat):
self.setMetaParam(FORMAT, type2name(volFormat))
+ def validateDelete(self):
+ """
+ Validate volume before deleting
+ """
+ try:
+ if self.isShared():
+ raise se.CannotDeleteSharedVolume("img %s vol %s" %
+ (self.imgUUID, self.volUUID))
+ except se.MetaDataKeyNotFoundError as e:
+ # In case of metadata key error, we have corrupted
+ # volume (One of metadata corruptions may be
+ # previous volume deletion failure).
+ # So, there is no reasons to avoid its deletion
+ self.log.warn("Volume %s metadata error (%s)",
+ self.volUUID, str(e))
+ if self.getChildren():
+ raise se.VolumeImageHasChildren(self)
+
class Volume(object):
log = logging.getLogger('Storage.Volume')
@@ -822,24 +840,6 @@
)
return volUUID
-
- def validateDelete(self):
- """
- Validate volume before deleting
- """
- try:
- if self.isShared():
- raise se.CannotDeleteSharedVolume("img %s vol %s" %
- (self.imgUUID, self.volUUID))
- except se.MetaDataKeyNotFoundError as e:
- # In case of metadata key error, we have corrupted
- # volume (One of metadata corruptions may be
- # previous volume deletion failure).
- # So, there is no reasons to avoid its deletion
- self.log.warn("Volume %s metadata error (%s)",
- self.volUUID, str(e))
- if self.getChildren():
- raise se.VolumeImageHasChildren(self)
def extend(self, newsize):
"""
--
To view, visit https://gerrit.ovirt.org/42000
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I06c8a87cb5b07d342b47fc54e75bc54ba00f5be2
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