Ravi Nori has uploaded a new change for review. Change subject: engine : Remove ACTIVE_ASYNC status ......................................................................
engine : Remove ACTIVE_ASYNC status Remove ACTIVE_ASYNC command status Change-Id: I382790a2f4042f2924a0916f62047790bb6d5e94 Bug-Url: https://bugzilla.redhat.com/1118249 Signed-off-by: Ravi Nori <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DestroyImageCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeStatusCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommandCallback.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandExecutor.java M backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/CommandStatus.java 8 files changed, 1 insertion(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/30702/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DestroyImageCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DestroyImageCommand.java index fa5a174..03bdfd3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DestroyImageCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DestroyImageCommand.java @@ -35,7 +35,6 @@ @Override protected void executeCommand() { - setCommandStatus(CommandStatus.ACTIVE_ASYNC); Guid taskId = persistAsyncTaskPlaceHolder(VdcActionType.DestroyImage); VDSReturnValue vdsReturnValue = runVdsCommand(VDSCommandType.DestroyImage, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeCommand.java index 9bf96bf..f58f102 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeCommand.java @@ -36,7 +36,6 @@ } public void executeCommand() { - setCommandStatus(CommandStatus.ACTIVE_ASYNC); VDSReturnValue vdsReturnValue = runVdsCommand(VDSCommandType.Merge, createVDSParameters()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeStatusCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeStatusCommand.java index 03c3e0e..d6c2c1d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeStatusCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeStatusCommand.java @@ -39,8 +39,6 @@ @Override protected void executeCommand() { - setCommandStatus(CommandStatus.ACTIVE_SYNC); - // Our contract with vdsm merge states that if the VM is found down, we // have to assume the merge failed. (It's okay if it really succeeded, // we can retry the operation without any issues.) diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java index 0baafee..e42cc0f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java @@ -40,7 +40,6 @@ import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.common.locks.LockingGroup; import org.ovirt.engine.core.common.utils.Pair; -import org.ovirt.engine.core.compat.CommandStatus; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector; import org.ovirt.engine.core.dao.SnapshotDao; @@ -129,8 +128,6 @@ removeImages(); if (getSnapshotActionType() == VdcActionType.RemoveSnapshotSingleDiskLive) { - // Enable callbacks in order to monitor for new-style child completion - setCommandStatus(CommandStatus.ACTIVE_ASYNC); persistCommand(getParameters().getParentCommand(), true); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommandCallback.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommandCallback.java index c1f0002..11754c7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommandCallback.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommandCallback.java @@ -19,8 +19,6 @@ for (Guid childCmdId : childCmdIds) { switch (TaskManagerUtil.getCommandStatus(childCmdId)) { case ACTIVE: - case ACTIVE_SYNC: - case ACTIVE_ASYNC: log.info("Waiting on Live Merge child commands to complete"); return; case FAILED: diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java index 64110ef..1b49439 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java @@ -77,8 +77,6 @@ if (currentChildId != null) { switch (TaskManagerUtil.getCommandStatus(currentChildId)) { case ACTIVE: - case ACTIVE_ASYNC: - case ACTIVE_SYNC: case NOT_STARTED: log.infoFormat("Waiting on Live Merge command step {0} to complete", getParameters().getCommandStep()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandExecutor.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandExecutor.java index 8721a1e..7c60ee1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandExecutor.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandExecutor.java @@ -60,7 +60,6 @@ Guid cmdId = entry.getKey(); CommandCallBack callBack = entry.getValue(); CommandStatus status = coco.getCommandStatus(cmdId); - switch (status) { case FAILED: callBack.onFailed(cmdId, coco.getChildCommandIds(cmdId)); @@ -73,7 +72,6 @@ iterator.remove(); break; case ACTIVE: - case ACTIVE_ASYNC: if (coco.getCommandEntity(cmdId).isExecuted()) { callBack.doPolling(cmdId, coco.getChildCommandIds(cmdId)); } @@ -149,9 +147,6 @@ cmdEntity.setReturnValue(result); if (!result.getCanDoAction()) { cmdEntity.setCommandStatus(CommandStatus.FAILED); - } else - if (CommandStatus.ACTIVE_SYNC.equals(cmdEntity.getCommandStatus())) { - cmdEntity.setCommandStatus(result.getSucceeded() ? CommandStatus.SUCCEEDED : CommandStatus.FAILED); } coco.persistCommand(cmdEntity); } diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/CommandStatus.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/CommandStatus.java index 5f9dd94..a13c495 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/CommandStatus.java +++ b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/CommandStatus.java @@ -4,10 +4,8 @@ UNKNOWN, NOT_STARTED, ACTIVE, // the execute methods on command base has been invoked - ACTIVE_SYNC, // used by synchronous commands to indicate that the sync command is executing - ACTIVE_ASYNC, // used by async commands to indicate that async command has been submitted FAILED, - FAILED_RESTARTED, // set by command executor to indicate that the sync command did not complete + FAILED_RESTARTED, // set by command executor to indicate that the command did not complete // and the server was restarted SUCCEEDED; } -- To view, visit http://gerrit.ovirt.org/30702 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I382790a2f4042f2924a0916f62047790bb6d5e94 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Ravi Nori <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
