From 051ecdea76dd82b4f61b798542528d8ba5492023 Mon Sep 17 00:00:00 2001 From: Selvasundaram Date: Thu, 18 Aug 2011 17:28:12 +0530 Subject: While deleting CIFS config, stop CIFS service will be called only if volume is online --- .../storage/management/gateway/resources/v1_0/VolumesResource.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java index e62f7a12..cfcf3f96 100644 --- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java +++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java @@ -80,6 +80,7 @@ import com.gluster.storage.management.core.exceptions.GlusterRuntimeException; import com.gluster.storage.management.core.exceptions.GlusterValidationException; import com.gluster.storage.management.core.model.Status; import com.gluster.storage.management.core.model.Volume; +import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS; import com.gluster.storage.management.core.model.VolumeLogMessage; import com.gluster.storage.management.core.response.LogMessageListResponse; import com.gluster.storage.management.core.response.VolumeListResponse; @@ -215,7 +216,10 @@ public class VolumesResource extends AbstractResource { volumeService.startCifsReExport(clusterName, volumeName); } else { // Stop the Cifs service and delete the users (!important) - volumeService.stopCifsReExport(clusterName, volumeName); + Volume newVolume = volumeService.getVolume(clusterName, volumeName); + if (newVolume.getStatus() == VOLUME_STATUS.ONLINE) { + volumeService.stopCifsReExport(clusterName, volumeName); + } volumeService.deleteCifsUsers(clusterName, volumeName); } } else { -- cgit