Nir Soffer has submitted this change and it was merged.
Change subject: virt: Allow _recover() to call vm.cont() in any VM state
......................................................................
virt: Allow _recover() to call vm.cont() in any VM state
By default, cont() returns error if the VM is in one of the following
states:
vmstatus.MIGRATION_SOURCE
Migration is in progress, VM status should not be changed till the
migration finishes.
vmstatus.SAVING_STATE
Hibernation is in progress, VM status should not be changed till the
hibernation finishes.
vmstatus.DOWN
VM is down, continuing is not possible from this state.
But if an error occured when performing an operation on a VM and
SourceThread._recover() is called, it must be able to call vm.cont() for
recovery purposes regardless of the VM's status.
To implement this, ignoreStatus parameter was added to vm.cont(). When
set to True, it forces vm.cont() to run even in the states listed above.
Change-Id: I5b1c7b4eecacf87ece48dc563fd2da294af0510b
Bug-Url:
https://bugzilla.redhat.com/show_bug.cgi?id=1238536
Signed-off-by: Shmuel Melamud <smelamud(a)redhat.com>
Reviewed-on:
https://gerrit.ovirt.org/47527
Continuous-Integration: Jenkins CI
Reviewed-by: Nir Soffer <nsoffer(a)redhat.com>
Reviewed-by: Francesco Romani <fromani(a)redhat.com>
---
M vdsm/virt/migration.py
M vdsm/virt/vm.py
2 files changed, 29 insertions(+), 4 deletions(-)
Approvals:
Nir Soffer: Looks good to me, but someone else must approve
Jenkins CI: Passed CI tests
Shmuel Leib Melamud: Verified
Francesco Romani: Looks good to me, approved
--
To view, visit
https://gerrit.ovirt.org/47527
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5b1c7b4eecacf87ece48dc563fd2da294af0510b
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Shmuel Leib Melamud <smelamud(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com>
Gerrit-Reviewer: Milan Zamazal <mzamazal(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com>
Gerrit-Reviewer: Shmuel Leib Melamud <smelamud(a)redhat.com>
Gerrit-Reviewer: Shmuel Melamud <smelamud(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>