Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
automat...@ovirt.org has posted comments on this change. Change subject: qemu-img: Handle image end offset on different lines of output .. Patch Set 3: * Update tracker::#1196072::OK * Check Bug-Url::OK * Check Public Bug::#1196072::OK, public bug * Check Product::#1196072::OK, Correct product Red Hat Enterprise Virtualization Manager * Check TR::SKIP, not in a monitored branch (ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/38355 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Ala Hino ah...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
automat...@ovirt.org has posted comments on this change. Change subject: qemu-img: Handle image end offset on different lines of output .. Patch Set 4: * Update tracker::#1196072::OK * Set MODIFIED::bug 1196072#1196072IGNORE, not oVirt prod but Red Hat Enterprise Virtualization Manager -- To view, visit https://gerrit.ovirt.org/38355 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Ala Hino ah...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
automat...@ovirt.org has posted comments on this change. Change subject: qemu-img: Handle image end offset on different lines of output .. Patch Set 1: * Update tracker::#1196072::OK * Check Bug-Url::OK * Check Public Bug::#1196072::OK, public bug * Check Product::#1196072::OK, Correct product Red Hat Enterprise Virtualization Manager * Check TR::SKIP, not in a monitored branch (ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/38355 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
automat...@ovirt.org has posted comments on this change. Change subject: qemu-img: Handle image end offset on different lines of output .. Patch Set 2: * Update tracker::#1196072::OK * Check Bug-Url::OK * Check Public Bug::#1196072::OK, public bug * Check Product::#1196072::OK, Correct product Red Hat Enterprise Virtualization Manager * Check TR::SKIP, not in a monitored branch (ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/38355 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
oVirt Jenkins CI Server has posted comments on this change. Change subject: qemu-img: Handle image end offset on different lines of output .. Patch Set 4: Build Failed http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el6-x86_64_merged/709/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-fc21-x86_64_merged/306/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit-tests_merged/4690/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc21-x86_64_merged/683/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-el6-x86_64_merged/310/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el7-x86_64_merged/708/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-el7-x86_64_merged/310/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-fc20-x86_64_merged/300/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc20-x86_64_merged/715/ : SUCCESS -- To view, visit https://gerrit.ovirt.org/38355 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Ala Hino ah...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
Allon Mureinik has posted comments on this change. Change subject: qemu-img: Handle image end offset on different lines of output .. Patch Set 3: Federico/Dan - can we proceed here? -- To view, visit https://gerrit.ovirt.org/38355 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Ala Hino ah...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
Dan Kenigsberg has posted comments on this change. Change subject: qemu-img: Handle image end offset on different lines of output .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/38355 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Ala Hino ah...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
Dan Kenigsberg has submitted this change and it was merged. Change subject: qemu-img: Handle image end offset on different lines of output .. qemu-img: Handle image end offset on different lines of output Current code assumes that qemu-img check output will place the image end offset in the second line of output but it can appear later: $ sudo qemu-img check /rhev/data-center/.../41b2b944-77f0-40d5-a681-c63e0dbb7482 No errors were found on the image. 70088/98304 = 71.30% allocated, 0.17% fragmented, 0.00% compressed clusters Image end offset: 4594466816 Update the scanner so it can find it on any line from the second until the end of output. Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1196072 Signed-off-by: Adam Litke ali...@redhat.com Reviewed-on: https://gerrit.ovirt.org/38355 Reviewed-by: Nir Soffer nsof...@redhat.com Reviewed-by: Ala Hino ah...@redhat.com Reviewed-by: Dan Kenigsberg dan...@redhat.com --- M lib/vdsm/qemuimg.py M tests/qemuimgTests.py 2 files changed, 51 insertions(+), 11 deletions(-) Approvals: Nir Soffer: Looks good to me, but someone else must approve Adam Litke: Verified Dan Kenigsberg: Looks good to me, approved Ala Hino: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/38355 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Ala Hino ah...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
Ala Hino has posted comments on this change. Change subject: qemu-img: Handle image end offset on different lines of output .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/38355 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Ala Hino ah...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
oVirt Jenkins CI Server has posted comments on this change. Change subject: qemu-img: Handle image end offset on different lines of output .. Patch Set 3: Build Successful http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/16254/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/15454/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/16424/ : SUCCESS -- To view, visit https://gerrit.ovirt.org/38355 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Ala Hino ah...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
Nir Soffer has posted comments on this change. Change subject: qemu-img: Handle image end offset on different lines of output .. Patch Set 3: Code-Review+1 Renaming the constants is not related, but it is good enough and we need a quick fix. -- To view, visit https://gerrit.ovirt.org/38355 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Ala Hino ah...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
Adam Litke has posted comments on this change. Change subject: qemu-img: Handle image end offset on different lines of output .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.ovirt.org/38355 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Ala Hino ah...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
Allon Mureinik has posted comments on this change. Change subject: qemu-img: Handle image end offset on different lines of output .. Patch Set 2: Code-Review+1 Ins't qemu-img's text output supposed to be stable? Regardless - I'd move forward with this patch. -- To view, visit https://gerrit.ovirt.org/38355 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Ala Hino ah...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
Tal Nisan has posted comments on this change.
Change subject: qemu-img: Handle image end offset on different lines of output
..
Patch Set 2: Code-Review+1
(1 comment)
Minor comment in the test
https://gerrit.ovirt.org/#/c/38355/2/tests/qemuimgTests.py
File tests/qemuimgTests.py:
Line 356: def call(cmd, **kw):
Line 357: out = [No errors were found on the image.,
Line 358:65157/98304 = 66.28% allocated, 0.00% fragmented,
0.00%
Line 359:compressed clusters,
Line 360:Image end offset: 4271243264]
s/ehd/end
Line 361: return 0, out, []
Line 362:
Line 363: with MonkeyPatchScope([(utils, execCmd, call)]):
Line 364: check = qemuimg.check('unused')
--
To view, visit https://gerrit.ovirt.org/38355
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke ali...@redhat.com
Gerrit-Reviewer: Adam Litke ali...@redhat.com
Gerrit-Reviewer: Ala Hino ah...@redhat.com
Gerrit-Reviewer: Allon Mureinik amure...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com
Gerrit-Reviewer: Nir Soffer nsof...@redhat.com
Gerrit-Reviewer: Tal Nisan tni...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
Dan Kenigsberg has posted comments on this change.
Change subject: qemu-img: Handle image end offset on different lines of output
..
Patch Set 2: Code-Review-1
(2 comments)
https://gerrit.ovirt.org/#/c/38355/2/lib/vdsm/qemuimg.py
File lib/vdsm/qemuimg.py:
Line 149: # FIXME: handle different error codes and raise errors accordingly
Line 150: if rc != 0:
Line 151: raise QImgError(rc, out, err)
Line 152: # Scan for 'offset' in the output
Line 153: for row in xrange(CHECK_OPTFIELDS_STARTIDX, len(out)):
the output is not very long, and we should start thinking about Python3 - so
please use range().
Line 154: try:
Line 155: check = {
Line 156: 'offset': int(__iregexSearch(offset, out[row]))
Line 157: }
https://gerrit.ovirt.org/#/c/38355/2/tests/qemuimgTests.py
File tests/qemuimgTests.py:
Line 337: def test_convert_unsupported(self, **kw):
Line 338: self.assertFalse(qemuimg._supports_src_cache('convert'))
Line 339:
Line 340:
Line 341: outputQemu2Check =
are these new variables/constants expected to be used ever?
Line 342: No errors were found on the image.
Line 343: 65157/98304 = 66.28% allocated, 0.00% fragmented, 0.00% compressed
clusters
Line 344: Image end offset: 4271243264
Line 345:
--
To view, visit https://gerrit.ovirt.org/38355
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke ali...@redhat.com
Gerrit-Reviewer: Adam Litke ali...@redhat.com
Gerrit-Reviewer: Ala Hino ah...@redhat.com
Gerrit-Reviewer: Allon Mureinik amure...@redhat.com
Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com
Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com
Gerrit-Reviewer: Nir Soffer nsof...@redhat.com
Gerrit-Reviewer: Tal Nisan tni...@redhat.com
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
oVirt Jenkins CI Server has posted comments on this change. Change subject: qemu-img: Handle image end offset on different lines of output .. Patch Set 2: Code-Review-1 Verified-1 Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/16203/ : UNSTABLE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/15403/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/16373/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created_staging/1179/ : FAILURE -- To view, visit https://gerrit.ovirt.org/38355 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Ala Hino ah...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
oVirt Jenkins CI Server has posted comments on this change. Change subject: qemu-img: Handle image end offset on different lines of output .. Patch Set 1: Code-Review-1 Verified-1 Build Failed http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/16201/ : UNSTABLE http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/15401/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/16371/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created_staging/1177/ : FAILURE -- To view, visit https://gerrit.ovirt.org/38355 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Ala Hino ah...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
Adam Litke has posted comments on this change. Change subject: qemu-img: Handle image end offset on different lines of output .. Patch Set 1: Verified+1 Verified that it resolves bug 1196072. Has unit tests. -- To view, visit https://gerrit.ovirt.org/38355 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
Adam Litke has uploaded a new change for review.
Change subject: qemu-img: Handle image end offset on different lines of output
..
qemu-img: Handle image end offset on different lines of output
Current code assumes that qemu-img check output will place the image end
offset in the second line of output but it can appear later:
$ sudo qemu-img check
/rhev/data-center/mnt/blockSD/7c166135-5a53-4e9a-a77d-119bdd48ea99/images/b5af6494-3f09-4c9e-9500-33a56450091b/41b2b944-77f0-40d5-a681-c63e0dbb7482
No errors were found on the image.
70088/98304 = 71.30% allocated, 0.17% fragmented, 0.00% compressed clusters
Image end offset: 4594466816
Update the scanner so it can find it on any line from the second until
the end of output.
Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1196072
Signed-off-by: Adam Litke ali...@redhat.com
---
M lib/vdsm/qemuimg.py
M tests/qemuimgTests.py
2 files changed, 50 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/55/38355/1
diff --git a/lib/vdsm/qemuimg.py b/lib/vdsm/qemuimg.py
index 78d175f..d0071c9 100644
--- a/lib/vdsm/qemuimg.py
+++ b/lib/vdsm/qemuimg.py
@@ -51,7 +51,7 @@
}
INFO_OPTFIELDS_STARTIDX = 4 # qemu-img info optional fields start in this line
-
+CHECK_OPTFIELDS_STARTIDX = 1 # qemu-img check 'offset' may appear on this line
class _RegexSearchError(Exception):
pass
@@ -149,15 +149,18 @@
# FIXME: handle different error codes and raise errors accordingly
if rc != 0:
raise QImgError(rc, out, err)
-try:
-check = {
-'offset': int(__iregexSearch(offset, out[1]))
-}
-# TODO: Add requires for qemu supporting offset and print exc_info
-except:
-raise QImgError(rc, out, err, unable to parse qemu-img check output)
-
-return check
+# Scan for 'offset' in the output
+for row in xrange(CHECK_OPTFIELDS_STARTIDX, len(out)):
+try:
+check = {
+'offset': int(__iregexSearch(offset, out[row]))
+}
+return check
+except _RegexSearchError:
+pass
+except:
+raise QImgError(rc, out, err,
+unable to parse qemu-img check output)
def convert(srcImage, dstImage, stop, srcFormat=None, dstFormat=None,
diff --git a/tests/qemuimgTests.py b/tests/qemuimgTests.py
index 4432d1b..08e04ef 100644
--- a/tests/qemuimgTests.py
+++ b/tests/qemuimgTests.py
@@ -336,3 +336,40 @@
@MonkeyPatch(utils, 'execCmd', convert_src_cache_unsupported)
def test_convert_unsupported(self, **kw):
self.assertFalse(qemuimg._supports_src_cache('convert'))
+
+
+outputQemu2Check =
+No errors were found on the image.
+65157/98304 = 66.28% allocated, 0.00% fragmented, 0.00% compressed clusters
+Image end offset: 4271243264
+
+
+outputQemuCheck =
+No errors were found on the image.
+Image end offset: 4271243264
+
+
+
+class CheckTests(TestCaseBase):
+
+def test_offset_with_stats(self):
+def call(cmd, **kw):
+out = [No errors were found on the image.,
+ 65157/98304 = 66.28% allocated, 0.00% fragmented, 0.00%
+ compressed clusters,
+ Image end offset: 4271243264]
+return 0, out, []
+
+with MonkeyPatchScope([(utils, execCmd, call)]):
+check = qemuimg.check('unused')
+self.assertEquals(4271243264, check['offset'])
+
+def test_offset_without_stats(self):
+def call(cmd, **kw):
+out = [No errors were found on the image.,
+ Image end offset: 4271243264]
+return 0, out, []
+
+with MonkeyPatchScope([(utils, execCmd, call)]):
+check = qemuimg.check('unused')
+self.assertEquals(4271243264, check['offset'])
--
To view, visit https://gerrit.ovirt.org/38355
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke ali...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
Nir Soffer has posted comments on this change. Change subject: qemu-img: Handle image end offset on different lines of output .. Patch Set 2: Code-Review+1 (1 comment) https://gerrit.ovirt.org/#/c/38355/2/lib/vdsm/qemuimg.py File lib/vdsm/qemuimg.py: Line 50: 'offset': re.compile(^Image end offset: (?Pvalue\d+)$), Line 51: } Line 52: Line 53: INFO_OPTFIELDS_STARTIDX = 4 # qemu-img info optional fields start in this line Line 54: CHECK_OPTFIELDS_STARTIDX = 1 # qemu-img check 'offset' may appear on this line may appear on this line or later. Line 55: Line 56: class _RegexSearchError(Exception): Line 57: pass Line 58: -- To view, visit https://gerrit.ovirt.org/38355 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
Adam Litke has posted comments on this change. Change subject: qemu-img: Handle image end offset on different lines of output .. Patch Set 1: (2 comments) https://gerrit.ovirt.org/#/c/38355/1/lib/vdsm/qemuimg.py File lib/vdsm/qemuimg.py: Line 159: except _RegexSearchError: Line 160: pass Line 161: except: Line 162: raise QImgError(rc, out, err, Line 163: unable to parse qemu-img check output) If we don't find the output, this will return None. Previously we raised QI fixed. Line 164: Line 165: Line 166: def convert(srcImage, dstImage, stop, srcFormat=None, dstFormat=None, Line 167: backing=None, backingFormat=None): https://gerrit.ovirt.org/#/c/38355/1/tests/qemuimgTests.py File tests/qemuimgTests.py: Line 350: Line 351: Line 352: Line 353: class CheckTests(TestCaseBase): Line 354: Lets add a negative test where we don't match anything and raise. Done Line 355: def test_offset_with_stats(self): Line 356: def call(cmd, **kw): Line 357: out = [No errors were found on the image., Line 358:65157/98304 = 66.28% allocated, 0.00% fragmented, 0.00% -- To view, visit https://gerrit.ovirt.org/38355 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
Nir Soffer has posted comments on this change. Change subject: qemu-img: Handle image end offset on different lines of output .. Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/38355/2//COMMIT_MSG Commit Message: Line 9: Current code assumes that qemu-img check output will place the image end Line 10: offset in the second line of output but it can appear later: Line 11: Line 12: $ sudo qemu-img check Line 13: /rhev/data-center/mnt/blockSD/7c166135-5a53-4e9a-a77d-119bdd48ea99/images/b5af6494-3f09-4c9e-9500-33a56450091b/41b2b944-77f0-40d5-a681-c63e0dbb7482 Lets fake the image path using shorter path to make the commit message nicer. Line 14: No errors were found on the image. Line 15: 70088/98304 = 71.30% allocated, 0.17% fragmented, 0.00% compressed clusters Line 16: Image end offset: 4594466816 Line 17: -- To view, visit https://gerrit.ovirt.org/38355 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
Adam Litke has posted comments on this change. Change subject: qemu-img: Handle image end offset on different lines of output .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.ovirt.org/38355 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: qemu-img: Handle image end offset on different lines of output
Nir Soffer has posted comments on this change. Change subject: qemu-img: Handle image end offset on different lines of output .. Patch Set 1: (2 comments) https://gerrit.ovirt.org/#/c/38355/1/lib/vdsm/qemuimg.py File lib/vdsm/qemuimg.py: Line 159: except _RegexSearchError: Line 160: pass Line 161: except: Line 162: raise QImgError(rc, out, err, Line 163: unable to parse qemu-img check output) If we don't find the output, this will return None. Previously we raised QImgError in this case. Line 164: Line 165: Line 166: def convert(srcImage, dstImage, stop, srcFormat=None, dstFormat=None, Line 167: backing=None, backingFormat=None): https://gerrit.ovirt.org/#/c/38355/1/tests/qemuimgTests.py File tests/qemuimgTests.py: Line 350: Line 351: Line 352: Line 353: class CheckTests(TestCaseBase): Line 354: Lets add a negative test where we don't match anything and raise. Line 355: def test_offset_with_stats(self): Line 356: def call(cmd, **kw): Line 357: out = [No errors were found on the image., Line 358:65157/98304 = 66.28% allocated, 0.00% fragmented, 0.00% -- To view, visit https://gerrit.ovirt.org/38355 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6610baf1702c9075d8512bdb1da0e05527a0060 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke ali...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Tal Nisan tni...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
