Omer Frenkel has uploaded a new change for review. Change subject: core: don't re-migrate vm after migration was canceled (#867347) ......................................................................
core: don't re-migrate vm after migration was canceled (#867347) https://bugzilla.redhat.com/show_bug.cgi?id=867347 if migration was canceled, vm went back to up on the source, this is identified as failure in migration, and re-run is called, causing migration to run again. this patch remove the vm from the async-running-vms list on cancel-migration, that way the vm will not be re-run when migration will be identified as failed. Change-Id: I9a8bf38bef90e5dfd0458cc13b8bb704f11d9f58 Signed-off-by: Omer Frenkel <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CancelMigrateVDSCommand.java 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/8658/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CancelMigrateVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CancelMigrateVDSCommand.java index 5935646..0811df9 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CancelMigrateVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CancelMigrateVDSCommand.java @@ -1,6 +1,8 @@ package org.ovirt.engine.core.vdsbroker.vdsbroker; import org.ovirt.engine.core.common.vdscommands.VdsAndVmIDVDSParametersBase; +import org.ovirt.engine.core.compat.Guid; +import org.ovirt.engine.core.vdsbroker.ResourceManager; public class CancelMigrateVDSCommand<P extends VdsAndVmIDVDSParametersBase> extends VdsBrokerCommand<P> { public CancelMigrateVDSCommand(P parameters) { @@ -9,7 +11,9 @@ @Override protected void ExecuteVdsBrokerCommand() { - status = getBroker().migrateCancel(getParameters().getVmId().toString()); + Guid vmId = getParameters().getVmId(); + status = getBroker().migrateCancel(vmId.toString()); ProceedProxyReturnValue(); + ResourceManager.getInstance().RemoveAsyncRunningVm(vmId); } } -- To view, visit http://gerrit.ovirt.org/8658 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9a8bf38bef90e5dfd0458cc13b8bb704f11d9f58 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Omer Frenkel <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
