diff options
| author | Shireesh Anjal <anjalshireesh@gmail.com> | 2011-08-21 23:37:18 -0700 |
|---|---|---|
| committer | Shireesh Anjal <anjalshireesh@gmail.com> | 2011-08-21 23:37:18 -0700 |
| commit | 13e54a61c3870815c384ab74f9bfca4c27efc1db (patch) | |
| tree | d41134a21b129021e86ea48ea9324d7bee697bb0 /src | |
| parent | 73f4e98ab69894e330e7758fae6dcc177f6554ad (diff) | |
| parent | ef8a0962ce2069b0c6082e33f2b08ae8b1738820 (diff) | |
Merge pull request #258 from Selvasundaram/master
Fixed - Bug 3452 - Deleting a CIFS enabled volume when the volume is in ...
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, 4 insertions, 2 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 3763b4bc..b892df32 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 @@ -214,13 +214,15 @@ public class VolumesResource extends AbstractResource { } else if (operation.equals(RESTConstants.TASK_REBALANCE_STOP)) { volumeService.rebalanceStop(clusterName, volumeName); } else if (operation.equals(RESTConstants.FORM_PARAM_CIFS_CONFIG)) { + Volume newVolume = volumeService.getVolume(clusterName, volumeName); if (enableCifs) { // After add/modify volume cifs users, start/restart the cifs service volumeService.createCIFSUsers(clusterName, volumeName, cifsUsers); - volumeService.startCifsReExport(clusterName, volumeName); + if (newVolume.getStatus() == VOLUME_STATUS.ONLINE) { + volumeService.startCifsReExport(clusterName, volumeName); + } } else { // Stop the Cifs service and delete the users (!important) - Volume newVolume = volumeService.getVolume(clusterName, volumeName); if (newVolume.getStatus() == VOLUME_STATUS.ONLINE) { volumeService.stopCifsReExport(clusterName, volumeName); } |