Omer Frenkel has posted comments on this change. Change subject: engine : Rebalance & Remove-brick stop to return status ......................................................................
Patch Set 10: (4 comments) http://gerrit.ovirt.org/#/c/28165/10/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterAsyncCommandBase.java File backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterAsyncCommandBase.java: Line 146: } Line 147: Line 148: private GlusterVolumeTaskStatusEntity updateHostDetails(GlusterVolumeTaskStatusEntity taskStatus) { Line 149: updateHostIP(taskStatus); Line 150: taskStatus.sort(); if it can be null in setStartAndStopTime it can be null here as well Line 151: return taskStatus; Line 152: } Line 153: Line 154: private GlusterVolumeTaskStatusEntity setStartAndStopTime(GlusterVolumeTaskStatusEntity status) { Line 180: Line 181: List<Step> stepsList = getStepDao().getStepsByExternalId(asyncTask.getTaskId()); Line 182: // if step has already ended, do not update status. Line 183: if (stepsList != null && !stepsList.isEmpty() && stepsList.get(0).getEndTime() != null) { Line 184: asyncTask.setStatus(status.getStatusSummary().getStatus()); and here Line 185: asyncTask.setMessage(GlusterTaskUtils.getInstance().getSummaryMessage(status.getStatusSummary())); Line 186: getGlusterTaskUtils().updateSteps(DbFacade.getInstance().getVdsGroupDao().get(upServer.getVdsGroupId()), asyncTask, stepsList); Line 187: Line 188: // release the volume lock if the task is completed http://gerrit.ovirt.org/#/c/28165/10/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StopRebalanceGlusterVolumeVDSCommand.java File backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StopRebalanceGlusterVolumeVDSCommand.java: Line 25: Line 26: GlusterVolumeTaskStatusEntity entity = result.getStatusDetails(); Line 27: entity.setStatusTime(new Date()); Line 28: entity.setStopTime(new Date()); Line 29: proceedProxyReturnValue(); why did you move this line? basically proceedProxyReturnValue should be called before using the result, because in case of error it might be null or not as expected, and NPE will hide the real error message from vdsm Line 30: setReturnValue(entity); Line 31: } http://gerrit.ovirt.org/#/c/28165/10/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StopRemoveGlusterVolumeBricksVDSCommand.java File backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StopRemoveGlusterVolumeBricksVDSCommand.java: Line 24: result = getBroker().glusterVolumeRemoveBricksStop(getParameters().getVolumeName(), Line 25: getParameters().getBrickDirectories().toArray(new String[0]), Line 26: getParameters().getReplicaCount()); Line 27: Line 28: GlusterVolumeTaskStatusEntity task = result.getStatusDetails(); here also Line 29: Line 30: task.setStatusTime(new Date()); Line 31: task.setStopTime(new Date()); Line 32: proceedProxyReturnValue(); -- To view, visit http://gerrit.ovirt.org/28165 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic91f437bd40b43f24f19d23a47297ae78dbd9372 Gerrit-PatchSet: 10 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: anmolbabu <[email protected]> Gerrit-Reviewer: Kanagaraj M <[email protected]> Gerrit-Reviewer: Omer Frenkel <[email protected]> Gerrit-Reviewer: Sahina Bose <[email protected]> Gerrit-Reviewer: Shubhendu Tripathi <[email protected]> Gerrit-Reviewer: Yair Zaslavsky <[email protected]> Gerrit-Reviewer: anmolbabu <[email protected]> Gerrit-Reviewer: [email protected] Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
