Francesco Romani has uploaded a new change for review.
Change subject: migration: make stop() update internal status ......................................................................
migration: make stop() update internal status
The SourceThread.stop() operation should update the internal status accordingly in case of success.
Previously, it was the caller that updated the status (!) adding unneeded coupling.
Change-Id: I0ab50fc789dde969b2fb9ab969241ed4ad12545c Signed-off-by: Francesco Romani fromani@redhat.com --- M vdsm/virt/migration.py 1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/40520/1
diff --git a/vdsm/virt/migration.py b/vdsm/virt/migration.py index 1eaed05..61d5a7b 100644 --- a/vdsm/virt/migration.py +++ b/vdsm/virt/migration.py @@ -371,6 +371,10 @@ except libvirt.libvirtError: if not self._preparingMigrationEvt: raise + else: + self.status['status']['message'] = \ + 'Migration process cancelled' + return self.status
def exponential_downtime(downtime, steps):
automation@ovirt.org has posted comments on this change.
Change subject: migration: make stop() update internal status ......................................................................
Patch Set 1:
* Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
automation@ovirt.org has posted comments on this change.
Change subject: migration: make stop() update internal status ......................................................................
Patch Set 2:
* Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
automation@ovirt.org has posted comments on this change.
Change subject: virt: enhance/fix migration.SourceThread.stop() ......................................................................
Patch Set 3:
* Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
automation@ovirt.org has posted comments on this change.
Change subject: virt: enhance/fix migration.SourceThread.stop() ......................................................................
Patch Set 4:
* Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
automation@ovirt.org has posted comments on this change.
Change subject: virt: enhance/fix migration.SourceThread.stop() ......................................................................
Patch Set 5:
* Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
automation@ovirt.org has posted comments on this change.
Change subject: virt: enhance/fix migration.SourceThread.stop() ......................................................................
Patch Set 6:
* Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
automation@ovirt.org has posted comments on this change.
Change subject: virt: enhance/fix migration.SourceThread.stop() ......................................................................
Patch Set 7:
* Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
automation@ovirt.org has posted comments on this change.
Change subject: virt: enhance/fix migration.SourceThread.stop() ......................................................................
Patch Set 8:
* Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
automation@ovirt.org has posted comments on this change.
Change subject: virt: enhance/fix migration.SourceThread.stop() ......................................................................
Patch Set 9:
* Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
automation@ovirt.org has posted comments on this change.
Change subject: virt: enhance/fix migration.SourceThread.stop() ......................................................................
Patch Set 10:
* Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
automation@ovirt.org has posted comments on this change.
Change subject: virt: enhance/fix migration.SourceThread.stop() ......................................................................
Patch Set 11:
* Update tracker: IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
Milan Zamazal has posted comments on this change.
Change subject: virt: enhance/fix migration.SourceThread.stop() ......................................................................
Patch Set 11: Verified+1
I checked the migration cancellation by starting and canceling migration from engine. As migration is currently generally broken in VDSM, it's a bit difficult to verify, but let's say cancellation works the same way for me before and after this change.
Francesco Romani has posted comments on this change.
Change subject: virt: enhance/fix migration.SourceThread.stop() ......................................................................
Patch Set 11: Code-Review+1
I asked Milan to adopt this change, and he was kind enough to take it. Wearing my reviewer (red :) ) hat, it looks ok to me, but let's check it again once migration works again on master.
vdsm-patches@lists.fedorahosted.org
-
automation＠ovirt.org -
fromani＠redhat.com -
mzamazal＠redhat.com