Hello Michal Skrivanek, Milan Zamazal,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/65306
to review the following change.
Change subject: virt: Don't crash in migration progress on compression bytes ......................................................................
virt: Don't crash in migration progress on compression bytes
If compression is not enabled for a migration then compression stats are not provided by libvirt. So when we try to retrieve them in migration Progress, we must not expect their presence, otherwise we crash there.
Backport-To: 4.0 Bug-Url: https://bugzilla.redhat.com/1380822 Change-Id: I1885940843d705ead161c13258f1979025a03873 Signed-off-by: Milan Zamazal mzamazal@redhat.com Reviewed-on: https://gerrit.ovirt.org/64468 Reviewed-by: Michal Skrivanek michal.skrivanek@redhat.com Continuous-Integration: Jenkins CI Reviewed-by: Francesco Romani fromani@redhat.com Reviewed-on: https://gerrit.ovirt.org/64499 --- M vdsm/virt/migration.py 1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/06/65306/1
diff --git a/vdsm/virt/migration.py b/vdsm/virt/migration.py index 8f2af23..e502756 100644 --- a/vdsm/virt/migration.py +++ b/vdsm/virt/migration.py @@ -769,7 +769,7 @@ stats[libvirt.VIR_DOMAIN_JOB_MEMORY_REMAINING], stats[libvirt.VIR_DOMAIN_JOB_MEMORY_BPS], stats[libvirt.VIR_DOMAIN_JOB_MEMORY_CONSTANT], - stats[libvirt.VIR_DOMAIN_JOB_COMPRESSION_BYTES], + stats.get(libvirt.VIR_DOMAIN_JOB_COMPRESSION_BYTES, 0), # available since libvirt 1.3 stats.get('memory_dirty_rate', -1), # available since libvirt 1.3
gerrit-hooks has posted comments on this change.
Change subject: virt: Don't crash in migration progress on compression bytes ......................................................................
Patch Set 1:
* #64468::Update tracker: OK * #1380822::Update tracker: OK * #64499::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1380822::OK, public bug * Check Product::#64468::IGNORE, not relevant for classification: Retired * Check Product::#1380822::OK, product: vdsm * Check Product::#64499::IGNORE, not relevant for classification: Retired * Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-4.0) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0'])
Francesco Romani has posted comments on this change.
Change subject: virt: Don't crash in migration progress on compression bytes ......................................................................
Patch Set 1: Code-Review+2 Verified+1
same code as ovirt-4.0, patch applied in the same order ovirt-4.0.5 branched too early
Francesco Romani has posted comments on this change.
Change subject: virt: Don't crash in migration progress on compression bytes ......................................................................
Patch Set 1: Continuous-Integration+1
run 'make check' manually and succesfully.
Francesco Romani has submitted this change and it was merged.
Change subject: virt: Don't crash in migration progress on compression bytes ......................................................................
virt: Don't crash in migration progress on compression bytes
If compression is not enabled for a migration then compression stats are not provided by libvirt. So when we try to retrieve them in migration Progress, we must not expect their presence, otherwise we crash there.
Backport-To: 4.0 Bug-Url: https://bugzilla.redhat.com/1380822 Change-Id: I1885940843d705ead161c13258f1979025a03873 Signed-off-by: Milan Zamazal mzamazal@redhat.com Reviewed-on: https://gerrit.ovirt.org/64468 Reviewed-by: Michal Skrivanek michal.skrivanek@redhat.com Continuous-Integration: Jenkins CI Reviewed-by: Francesco Romani fromani@redhat.com Reviewed-on: https://gerrit.ovirt.org/64499 Reviewed-on: https://gerrit.ovirt.org/65306 Tested-by: Francesco Romani fromani@redhat.com Continuous-Integration: Francesco Romani fromani@redhat.com --- M vdsm/virt/migration.py 1 file changed, 1 insertion(+), 1 deletion(-)
Approvals: Francesco Romani: Verified; Looks good to me, approved; Passed CI tests
gerrit-hooks has posted comments on this change.
Change subject: virt: Don't crash in migration progress on compression bytes ......................................................................
Patch Set 2:
* #1380822::Update tracker: OK * Set MODIFIED::bug 1380822::::#1380822::::IGNORE, not all related patches are closed, check 65307
vdsm-patches@lists.fedorahosted.org