Sahina Bose has uploaded a new change for review. Change subject: engine: Correct check for gluster tasks that need monitoring ......................................................................
engine: Correct check for gluster tasks that need monitoring When deciding if a task started from CLI needs monitoring, we were only checking if the task's status is STARTED. Remove-brick task, though completed, need's either an abort or retain for the job to be finished. Hence these tasks need to be monitored as well Change-Id: I4eae942f3e96368ec07362e94b008fd17dafb2bd Signed-off-by: Sahina Bose <sab...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJob.java 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/87/22187/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJob.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJob.java index 5df229b..4823458 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJob.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJob.java @@ -131,7 +131,7 @@ } private void createJobToMonitor(VDSGroup cluster, GlusterAsyncTask task) { - if (task.getStatus() != JobExecutionStatus.STARTED) { + if (!isTaskToBeMonitored(task)) { return; //there's no need to monitor jobs that are failed or completed } StepEnum step = task.getType().getStep(); @@ -159,6 +159,10 @@ updateVolumeBricksAndLock(cluster, task); } + private boolean isTaskToBeMonitored(GlusterAsyncTask task) { + return task.getStatus() == JobExecutionStatus.STARTED || task.getType() == GlusterTaskType.REMOVE_BRICK; + } + private Guid addAsyncTaskStep(VDSGroup cluster, GlusterAsyncTask task, StepEnum step, Guid execStepId) { VdcReturnValueBase result; result = getBackend().runInternalAction(VdcActionType.AddInternalStep, -- To view, visit http://gerrit.ovirt.org/22187 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4eae942f3e96368ec07362e94b008fd17dafb2bd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sahina Bose <sab...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches