Change in vdsm[master]: upgrade: fix v3ResetMetaVolSize argument

[Federico Simoncelli]

Federico Simoncelli has uploaded a new change for review.

Change subject: upgrade: fix v3ResetMetaVolSize argument
......................................................................

upgrade: fix v3ResetMetaVolSize argument

In commit c072945 (one shot prepare) the v3ResetMetaVolSize argument
was changed from volume object to volume uuid (string) triggering
attribute errors during the execution (e.g. getMetaParam, etc.).
This patch fixes the issue reintroducing the volume objects and the
relevant exception handling.

Change-Id: Iddffa996652300e5a5daa19bef5bd7873f39bb15
Signed-off-by: Federico Simoncelli 
---
M vdsm/storage/imageRepository/formatConverter.py
1 file changed, 15 insertions(+), 3 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/21/20721/1

diff --git a/vdsm/storage/imageRepository/formatConverter.py b/vdsm/storage/imageRepository/formatConverter.py
index a95bfe6..441f484 100644
--- a/vdsm/storage/imageRepository/formatConverter.py
+++ b/vdsm/storage/imageRepository/formatConverter.py
@@ -274,13 +274,25 @@
                     log.error("Image %s can't be activated.",
                               imgUUID, exc_info=True)

-                for vol in imgVolumes:
+                for volUUID in imgVolumes:
                     try:
-                        v3ResetMetaVolSize(vol)  # BZ#811880
+                        v3ResetMetaVolSize(  # BZ#811880
+                            domain.produceVolume(imgUUID, volUUID))
                     except qemuImg.QImgError:
                         log.error("It is not possible to read the volume %s "
                                   "using qemu-img, the content looks damaged",
-                                  vol.volUUID, exc_info=True)
+                                  volUUID, exc_info=True)
+
+            except se.VolumeDoesNotExist:
+                log.error("It is not possible to prepare the image %s, the "
+                          "volume chain looks damaged", imgUUID,
+                          exc_info=True)
+
+            except se.MetaDataKeyNotFoundError:
+                log.error("It is not possible to prepare the image %s, the "
+                          "volume metadata looks damaged", imgUUID,
+                          exc_info=True)
+
             finally:
                 try:
                     domain.deactivateImage(imgUUID)

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: upgrade: fix v3ResetMetaVolSize argument
......................................................................

Patch Set 2: Verified-1

Build Failed

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5221/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4342/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5146/ : SUCCESS

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: upgrade: fix v3ResetMetaVolSize argument
......................................................................

Patch Set 1: Verified-1

Build Failed

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5220/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4341/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5145/ : SUCCESS

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: upgrade: fix v3ResetMetaVolSize argument
......................................................................

Patch Set 2: Code-Review+1

cr*p. all because of an ancient bug.

Sergey Gotliv has posted comments on this change.

Change subject: upgrade: fix v3ResetMetaVolSize argument
......................................................................

Patch Set 2: Code-Review+1

[Federico Simoncelli]

Federico Simoncelli has posted comments on this change.

Change subject: upgrade: fix v3ResetMetaVolSize argument
......................................................................

Patch Set 3: Verified+1

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: upgrade: fix v3ResetMetaVolSize argument
......................................................................

Patch Set 3:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4414/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5218/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5294/ : SUCCESS

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: upgrade: fix v3ResetMetaVolSize argument
......................................................................

Patch Set 3: Code-Review+2

same as ps2.

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: upgrade: fix v3ResetMetaVolSize argument
......................................................................

upgrade: fix v3ResetMetaVolSize argument

In commit c072945 (one shot prepare) the v3ResetMetaVolSize argument
was changed from volume object to volume uuid (string) triggering
attribute errors during the execution (e.g. getMetaParam, etc.).
This patch fixes the issue reintroducing the volume objects and the
relevant exception handling.

Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1022975
Change-Id: Iddffa996652300e5a5daa19bef5bd7873f39bb15
Signed-off-by: Federico Simoncelli 
Reviewed-on: http://gerrit.ovirt.org/20721
Reviewed-by: Dan Kenigsberg 
---
M vdsm/storage/imageRepository/formatConverter.py
1 file changed, 15 insertions(+), 3 deletions(-)

Approvals:
  Federico Simoncelli: Verified
  Dan Kenigsberg: Looks good to me, approved