Arik Hadas has uploaded a new change for review. Change subject: core: runningFailed ......................................................................
core: runningFailed Change-Id: I1e24011ea31e504439614bf2876cf81a47d3d3c1 Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java 3 files changed, 10 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/24118/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java index 2755ad9..2bd37b5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java @@ -89,9 +89,7 @@ protected void failedToMigrate() { try { determineMigrationFailureForAuditLog(); - _isRerun = false; - setSucceeded(false); - failedToRunVm(); + runningFailed(); } finally { freeLock(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java index d04ed91..f27cde0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java @@ -253,9 +253,7 @@ else { setCommandShouldBeLogged(false); - setSucceeded(false); - _isRerun = false; - failedToRunVm(); + runningFailed(); } } @@ -869,11 +867,11 @@ } @Override - protected void failedToRunVm() { + protected void runningFailed() { if (memoryFromSnapshotIrrelevant) { removeMemoryFromActiveSnapshot(); } - super.failedToRunVm(); + super.runningFailed(); } private void removeMemoryFromActiveSnapshot() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java index 7bd20fc..27e10ab 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java @@ -119,18 +119,20 @@ // if there was no rerun attempt in the previous executeAction call and the command // wasn't done because canDoAction check returned false.. if (!_isRerun && !getReturnValue().getCanDoAction()) { - failedToRunVm(); + runningFailed(); } // signal the caller that a rerun was made _isRerun = true; } else { - Backend.getInstance().getResourceManager().RemoveAsyncRunningCommand(getVmId()); - failedToRunVm(); + runningFailed(); } } - protected void failedToRunVm() { + protected void runningFailed() { + Backend.getInstance().getResourceManager().RemoveAsyncRunningCommand(getVmId()); + _isRerun = false; + setSucceeded(false); log(); processVmPoolOnStopVm(); ExecutionHandler.setAsyncJob(getExecutionContext(), false); -- To view, visit http://gerrit.ovirt.org/24118 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1e24011ea31e504439614bf2876cf81a47d3d3c1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
