Ravi Nori has uploaded a new change for review. Change subject: engine : Simplify persistCommand ......................................................................
engine : Simplify persistCommand Simplify persist command in command base Change-Id: Ie6f38c3eb2a38536febe7f65c65b256d0c0798f3 Bug-Url: https://bugzilla.redhat.com/1118249 Signed-off-by: Ravi Nori <rn...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java 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/MergeCommandCallback.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/RemoveSnapshotSingleDiskLiveCommand.java 7 files changed, 7 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/88/30688/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java index eed9860..8610966 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java @@ -2107,11 +2107,7 @@ getReturnValue().setCanDoAction(internalReturnValue.getCanDoAction()); } - public void persistCommandWithoutContext(VdcActionType parentCommand, boolean enableCallBack) { - persistCommand(parentCommand, null, enableCallBack); - } - - public void persistCommandWithContext(VdcActionType parentCommand, boolean enableCallBack) { + public void persistCommand(VdcActionType parentCommand, boolean enableCallBack) { persistCommand(parentCommand, getContext(), enableCallBack); } 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 50ce643..fa5a174 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 @@ -49,7 +49,7 @@ getReturnValue().getVdsmTaskIdList().add(result); getParameters().getVdsmTaskIds().add(result); setSucceeded(vdsReturnValue.getSucceeded()); - persistCommandWithContext(getParameters().getParentCommand(), true); + persistCommand(getParameters().getParentCommand(), true); log.info("Successfully started task to remove orphaned volumes resulting from live merge"); } else { setSucceeded(false); 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 66aed2e..9bf96bf 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 @@ -46,7 +46,7 @@ getParameters().setVmJobId(jobId); // setSucceeded to indicate executeCommand success; doPolling will check commandStatus setSucceeded(true); - persistCommandWithContext(getParameters().getParentCommand(), true); + persistCommand(getParameters().getParentCommand(), true); log.debug("Merge started successfully"); } else { log.error("Failed to start Merge on VDS"); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeCommandCallback.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeCommandCallback.java index 4ee03b1..09e5635 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeCommandCallback.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeCommandCallback.java @@ -35,7 +35,7 @@ // It finished; a command will be called later to determine the status. command.setSucceeded(true); command.setCommandStatus(CommandStatus.SUCCEEDED); - command.persistCommandWithContext(command.getParameters().getParentCommand(), true); + command.persistCommand(command.getParameters().getParentCommand(), true); } log.infoFormat("Merge command has completed for images {0}..{1}", command.getParameters().getBaseImage().getImageId(), 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 b1c47e5..03c3e0e 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 @@ -75,7 +75,7 @@ MergeStatusReturnValue returnValue = new MergeStatusReturnValue(jobType, imagesToRemove); getReturnValue().setActionReturnValue(returnValue); setSucceeded(true); - persistCommandWithContext(getParameters().getParentCommand(), true); + persistCommand(getParameters().getParentCommand(), true); setCommandStatus(CommandStatus.SUCCEEDED); } 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 bb41322..75240f9 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 @@ -133,7 +133,7 @@ if (getSnapshotActionType() == VdcActionType.RemoveSnapshotSingleDiskLive) { // Enable callbacks in order to monitor for new-style child completion setCommandStatus(CommandStatus.ACTIVE_ASYNC); - persistCommandWithoutContext(getParameters().getParentCommand(), true); + persistCommand(getParameters().getParentCommand(), true); useTaskManagerToRemoveMemory = true; } } 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 55b6b0d..cffe866 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 @@ -150,7 +150,7 @@ break; } - persistCommandWithContext(getParameters().getParentCommand(), true); + persistCommand(getParameters().getParentCommand(), true); if (nextCommand != null) { TaskManagerUtil.executeAsyncCommand(nextCommand.getFirst(), nextCommand.getSecond(), cloneContextAndDetachFromParent()); } -- To view, visit http://gerrit.ovirt.org/30688 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6f38c3eb2a38536febe7f65c65b256d0c0798f3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <rn...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
