Shubhendu Tripathi has uploaded a new change for review. Change subject: gluster: Introduced GlusterTaskUtils ......................................................................
gluster: Introduced GlusterTaskUtils Introduced a utility class GlusterTaskUtils. This class provides gluster asynchronous tasks related utiltity methods like isTaskOfType() and isTaskStatus(). These methods check the different field values related to asynchronous task on a given volume. Change-Id: Ib58610601c64f16796962d0ebf8643fa591b82e6 Signed-off-by: Shubhendu Tripathi <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StopRebalanceGlusterVolumeCommand.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/tasks/GlusterTaskUtils.java 2 files changed, 28 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/07/19507/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StopRebalanceGlusterVolumeCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StopRebalanceGlusterVolumeCommand.java index cfa82e7..115216b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StopRebalanceGlusterVolumeCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StopRebalanceGlusterVolumeCommand.java @@ -1,6 +1,7 @@ package org.ovirt.engine.core.bll.gluster; import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute; +import org.ovirt.engine.core.bll.gluster.tasks.GlusterTaskUtils; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.gluster.GlusterVolumeRebalanceParameters; import org.ovirt.engine.core.common.asynctasks.gluster.GlusterTaskType; @@ -36,9 +37,8 @@ return false; } - if (glusterVolume.getAsyncTask() == null - || glusterVolume.getAsyncTask().getType() != GlusterTaskType.REBALANCE - || glusterVolume.getAsyncTask().getStatus() != JobExecutionStatus.STARTED) { + if (!(GlusterTaskUtils.isTaskOfType(glusterVolume, GlusterTaskType.REBALANCE)) + || !(GlusterTaskUtils.isTaskStatus(glusterVolume, JobExecutionStatus.STARTED))) { return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_GLUSTER_VOLUME_REBALANCE_NOT_STARTED); } return true; @@ -54,7 +54,7 @@ VDSReturnValue vdsReturnaValue = runVdsCommand(VDSCommandType.StopRebalanceGlusterVolume, new GlusterVolumeVDSParameters(upServer.getId(), - getGlusterVolumeName())); + getGlusterVolumeName())); setSucceeded(vdsReturnaValue.getSucceeded()); if (!getSucceeded()) { handleVdsError(AuditLogType.GLUSTER_VOLUME_REBALANCE_STOP_FAILED, vdsReturnaValue.getVdsError() diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/tasks/GlusterTaskUtils.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/tasks/GlusterTaskUtils.java new file mode 100644 index 0000000..8451152 --- /dev/null +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/tasks/GlusterTaskUtils.java @@ -0,0 +1,24 @@ +package org.ovirt.engine.core.bll.gluster.tasks; + +import org.ovirt.engine.core.common.asynctasks.gluster.GlusterTaskType; +import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity; +import org.ovirt.engine.core.common.job.JobExecutionStatus; + +public class GlusterTaskUtils { + + public static boolean isTaskOfType(GlusterVolumeEntity volume, GlusterTaskType type) { + if (volume.getAsyncTask() != null && volume.getAsyncTask().getType() == type) { + return true; + } + + return false; + } + + public static boolean isTaskStatus(GlusterVolumeEntity volume, JobExecutionStatus status) { + if (volume.getAsyncTask() != null && volume.getAsyncTask().getStatus() == status) { + return true; + } + + return false; + } +} -- To view, visit http://gerrit.ovirt.org/19507 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib58610601c64f16796962d0ebf8643fa591b82e6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shubhendu Tripathi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
