diff options
| author | Shireesh Anjal <anjalshireesh@gmail.com> | 2011-08-18 05:36:45 -0700 |
|---|---|---|
| committer | Shireesh Anjal <anjalshireesh@gmail.com> | 2011-08-18 05:36:45 -0700 |
| commit | bf2b18a7a6a1812c6ce6e3cccfb1458d2954e158 (patch) | |
| tree | e8c739d3861b6985428ec1b7f9f96f3cef78c155 /src | |
| parent | 8abdcc3ff691f992cb3c7af87168b105b86549f4 (diff) | |
| parent | 77c9470096a4abf1304474f1c31015812ec7b697 (diff) | |
Merge pull request #249 from Selvasundaram/master
While deleting CIFS config, stop CIFS service will be called only if vol...
Diffstat (limited to 'src')
| -rw-r--r-- | src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java | 6 |
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 { |