Maor Lipchuk has uploaded a new change for review. Change subject: core: RemoveAllVmCinderDisks - handle command statuses. ......................................................................
core: RemoveAllVmCinderDisks - handle command statuses. * Handle NOT_STARTED and SUCCEEDED command statuses on RemoveAllVmCinderDisksCommandCallback. * Set parent command and parameters in RemoveVmCinderDisksCommand. Change-Id: Id1570268b02145081d2d2d3207ffac8c0f983740 Bug-Url: https://bugzilla.redhat.com/1185826 Signed-off-by: Maor Lipchuk <mlipc...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmCinderDisksCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmCinderDisksCommandCallBack.java 2 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/42318/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmCinderDisksCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmCinderDisksCommand.java index fc4d91f..bb9c3bd 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmCinderDisksCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmCinderDisksCommand.java @@ -68,6 +68,8 @@ private RemoveDiskParameters buildChildCommandParameters(CinderDisk cinderDisk) { RemoveDiskParameters param = new RemoveDiskParameters(cinderDisk.getId(), cinderDisk.getStorageIds().get(0)); + param.setParentCommand(getActionType()); + param.setParentParameters(getParameters()); return withRootCommandInfo(param, getParameters().getParentCommand()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmCinderDisksCommandCallBack.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmCinderDisksCommandCallBack.java index a4316af..c2c7fdf 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmCinderDisksCommandCallBack.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmCinderDisksCommandCallBack.java @@ -19,9 +19,12 @@ boolean anyFailed = false; for (Guid childCmdId : childCmdIds) { switch (CommandCoordinatorUtil.getCommandStatus(childCmdId)) { + case NOT_STARTED: case ACTIVE: log.info("Waiting for child commands to complete"); return; + case SUCCEEDED: + break; case FAILED: case FAILED_RESTARTED: case UNKNOWN: -- To view, visit https://gerrit.ovirt.org/42318 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id1570268b02145081d2d2d3207ffac8c0f983740 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches