diff options
| author | Selvasundaram <selvam@gluster.com> | 2011-08-22 12:02:53 +0530 |
|---|---|---|
| committer | Selvasundaram <selvam@gluster.com> | 2011-08-22 12:02:53 +0530 |
| commit | 759fe98cb74a47e8151a073fd277914b2c2920d3 (patch) | |
| tree | b41eef61dfaae295d25432a21a1bac5d9ee0e763 | |
| parent | 36df5d213037e94d4434c50d29a3e15649da49d4 (diff) | |
Fixed - Bug 3452 - Deleting a CIFS enabled volume when the volume is in stopped state throws error message "volume couldnot be deleted"
| -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); } |