summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSelvasundaram <selvam@gluster.com>2011-08-18 17:28:12 +0530
committerSelvasundaram <selvam@gluster.com>2011-08-18 17:28:12 +0530
commit051ecdea76dd82b4f61b798542528d8ba5492023 (patch)
treee8c739d3861b6985428ec1b7f9f96f3cef78c155 /src
parent2cb6c6c068db98eb8f121aec5d640cfd3737afbc (diff)
While deleting CIFS config, stop CIFS service will be called only if volume is online
Diffstat (limited to 'src')
-rw-r--r--src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java6
1 files changed, 5 insertions, 1 deletions
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 {