Kanagaraj M has uploaded a new change for review. Change subject: gluster: fix cleaning up orphan tasks ......................................................................
gluster: fix cleaning up orphan tasks When there is rebalance task in progress and 'task list' is failed in vdsm for some reason, engine should not cleanup this task and move to UNKNOWN. Change-Id: I4f9bb53e5c2be194efeba966355d0245bcc18384 Bug-Url: https://bugzilla.redhat.com/1060994 Signed-off-by: Kanagaraj M <kmayi...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJob.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJobTest.java 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/24025/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 9d19f68..9e9b3f7 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 @@ -334,7 +334,9 @@ for (Guid taskId: tasksNotRunning) { GlusterVolumeEntity vol= getVolumeDao().getVolumeByGlusterTask(taskId); - if (vol != null && vol.getStatus() != GlusterStatus.UP && !runningTasksInClusterMap.keySet().contains((vol.getClusterId()))) { + if (vol != null + && (vol.getStatus() != GlusterStatus.UP || !runningTasksInClusterMap.keySet() + .contains(vol.getClusterId()))) { // the volume is not UP. Hence gluster may not have been able to return tasks for the volume // also handling the case where gluster was not able to return any tasks from this cluster - the keyset will not // contain the cluster id in such case diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJobTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJobTest.java index 27faa2f..5bfdbe3 100755 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJobTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJobTest.java @@ -248,6 +248,7 @@ GlusterVolumeEntity vol = new GlusterVolumeEntity(); vol.setStatus(GlusterStatus.UP); vol.setId(VOL_GUIDS[i]); + vol.setClusterId(CLUSTER_GUIDS[1]); return vol; } -- To view, visit http://gerrit.ovirt.org/24025 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4f9bb53e5c2be194efeba966355d0245bcc18384 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Kanagaraj M <kmayi...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
