Change in vdsm[master]: storage: Fix removeMetadata

alitke at redhat.com alitke at redhat.com
Fri Jan 15 17:13:13 UTC 2016


Adam Litke has uploaded a new change for review.

Change subject: storage: Fix removeMetadata
......................................................................

storage: Fix removeMetadata

In commit 2fd92bd3 we moved removeMetadata to the VolumeManifest.  We
made a mistake by using a common redirection method in the Volume class.
Unfortunately, the block version takes a metaId parameter and the file
version takes no arguments.  To fix, each volume type must perform its
own indirection with the correct number of arguments.

Change-Id: I7ae92e88b2331f4fa37e5b1646734bce5185cc06
Signed-off-by: Adam Litke <alitke at redhat.com>
---
M tests/sdm_indirection_tests.py
M vdsm/storage/blockVolume.py
M vdsm/storage/fileVolume.py
M vdsm/storage/volume.py
4 files changed, 16 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/00/51900/1

diff --git a/tests/sdm_indirection_tests.py b/tests/sdm_indirection_tests.py
index 99c0892..3801e3f 100644
--- a/tests/sdm_indirection_tests.py
+++ b/tests/sdm_indirection_tests.py
@@ -487,10 +487,6 @@
     def validateDelete(self):
         pass
 
-    @recorded
-    def removeMetadata(self):
-        pass
-
     @classmethod
     @recorded
     def newVolumeLease(cls, metaId, sdUUID, volUUID):
@@ -555,6 +551,10 @@
     def getDevPath(self):
         pass
 
+    @recorded
+    def removeMetadata(self, metaId):
+        pass
+
 
 class FakeFileVolumeManifest(FakeVolumeManifest):
     def __init__(self):
@@ -576,6 +576,10 @@
 
     @recorded
     def _getLeaseVolumePath(self, vol_path):
+        pass
+
+    @recorded
+    def removeMetadata(self):
         pass
 
 
@@ -809,7 +813,6 @@
         ['getVmVolumeInfo', 0],
         ['getVolumeParams', 1],
         ['validateDelete', 0],
-        ['removeMetadata', 0],
         ['refreshVolume', 0],
         ['_share', 1],
         ['_shareLease', 1],
@@ -853,6 +856,7 @@
         ['setParentTag', 1],
         ['_setrw', 1],
         ['getDevPath', 0],
+        ['removeMetadata', 1],
         ])
     def test_functions(self, fn, nargs):
         self.checker.check_method_call(fn, nargs)
@@ -875,6 +879,7 @@
         ['_getMetaVolumePath', 1],
         ['_getLeaseVolumePath', 1],
         ['_setrw', 1],
+        ['removeMetadata', 0],
         ])
     def test_functions(self, fn, nargs):
         self.checker.check_method_call(fn, nargs)
diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py
index 1dd6ab5..412166b 100644
--- a/vdsm/storage/blockVolume.py
+++ b/vdsm/storage/blockVolume.py
@@ -451,6 +451,9 @@
 
         return alloc_size
 
+    def removeMetadata(self, metaId):
+        self._manifest.removeMetadata(metaId)
+
     def delete(self, postZero, force):
         """ Delete volume
             'postZero' - zeroing file before deletion
diff --git a/vdsm/storage/fileVolume.py b/vdsm/storage/fileVolume.py
index ed53da7..0c9ad60 100644
--- a/vdsm/storage/fileVolume.py
+++ b/vdsm/storage/fileVolume.py
@@ -436,6 +436,9 @@
 
         return (volPath,)
 
+    def removeMetadata(self):
+        self._manifest.removeMetadata()
+
     def delete(self, postZero, force):
         """
         Delete volume.
diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py
index c26f236..ba68464 100644
--- a/vdsm/storage/volume.py
+++ b/vdsm/storage/volume.py
@@ -620,9 +620,6 @@
         """
         self._manifest._setrw(rw)
 
-    def removeMetadata(self):
-        self._manifest.removeMetadata()
-
     def _share(self, dstImgPath):
         return self._manifest._share(dstImgPath)
 


-- 
To view, visit https://gerrit.ovirt.org/51900
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ae92e88b2331f4fa37e5b1646734bce5185cc06
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