Moti Asayag has posted comments on this change. Change subject: wip, engine : Remove Disk command using getVolumeInfo ......................................................................
Patch Set 5: (3 comments) https://gerrit.ovirt.org/#/c/39374/5/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java File backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java: Line 292: @Override Line 293: protected void executeCommand() { Line 294: switch (getDisk().getDiskStorageType()) { Line 295: case IMAGE: Line 296: if (getDisk().getDiskStorageType() == DiskStorageType.IMAGE) { this check is redundant - this code is executed from the 'IMAGE' case of the switch statement. Line 297: Future<VdcReturnValueBase> future = CommandCoordinatorUtil.executeAsyncCommand( Line 298: VdcActionType.RemoveImage, Line 299: buildRemoveImageParameters(getDiskImage()), Line 300: cloneContextAndDetachFromParent()); https://gerrit.ovirt.org/#/c/39374/5/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommandCallback.java File backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommandCallback.java: Line 23: if (asyncRetVal == null) { Line 24: DiskImage diskImage = cmd.getDiskImage(); Line 25: Guid storagePoolId = diskImage.getStoragePoolId() != null ? diskImage.getStoragePoolId() : Guid.Empty; Line 26: Guid storageDomainId = (cmd.getParameters().getStorageDomainId() == null || Line 27: Guid.Empty.equals(cmd.getParameters().getStorageDomainId())) && condition can be simplified by using: Guid.isNullOrEmpty(cmd.getParameters().getStorageDomainId()) Line 28: cmd.getDiskImage() != null ? Line 29: diskImage.getStorageIds().get(0) : cmd.getParameters().getStorageDomainId(); Line 30: asyncRetVal = ResourceManager.getInstance().runAsyncVdsCommand(VDSCommandType.GetImageInfo, Line 31: new GetImageInfoVDSCommandParameters(storagePoolId, Line 35: } Line 36: Line 37: if (asyncRetVal != null && asyncRetVal.isRequestCompleted()) { Line 38: Object retVal = asyncRetVal.getReturnValue(); Line 39: if (retVal == null) { wouldn't it be more clear to check if asyncRetVal.getSucceeded() to determine the action success ? Line 40: cmd.setCommandStatus(asyncRetVal.getSucceeded() ? CommandStatus.FAILED : CommandStatus.SUCCEEDED); Line 41: } else { Line 42: asyncRetVal = null; Line 43: } -- To view, visit https://gerrit.ovirt.org/39374 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I458143387f89a5d55bda5f1d4f9d44be4f7fb197 Gerrit-PatchSet: 5 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <rn...@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <lara...@redhat.com> Gerrit-Reviewer: Moti Asayag <masa...@redhat.com> Gerrit-Reviewer: Oved Ourfali <oourf...@redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczew...@gmail.com> Gerrit-Reviewer: Ravi Nori <rn...@redhat.com> Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
