diff options
| author | Shireesh Anjal <anjalshireesh@gmail.com> | 2011-08-17 09:49:57 -0700 |
|---|---|---|
| committer | Shireesh Anjal <anjalshireesh@gmail.com> | 2011-08-17 09:49:57 -0700 |
| commit | 8abdcc3ff691f992cb3c7af87168b105b86549f4 (patch) | |
| tree | 33e7826c5535255d1efc9e3c09b35cec36aa85ab | |
| parent | b6bb0eca7d0a861c6636b06d677dc7aa06c31a46 (diff) | |
| parent | 2cb6c6c068db98eb8f121aec5d640cfd3737afbc (diff) | |
Merge pull request #248 from Selvasundaram/master
Stop cifs re-export called after deleting volume cifs config issue - fix
2 files changed, 4 insertions, 2 deletions
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java index 760e22fd..a0bee373 100644 --- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java +++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java @@ -295,8 +295,6 @@ public class VolumeService { ProcessResult result = serverUtil.executeGlusterScript(true, VOLUME_DELETE_CIFS_SCRIPT, file.getAbsolutePath(), volumeName); file.delete(); - // All the CIFS users deleted, hence stop CIFS service for this volume - stopCifsReExport(clusterName, volumeName); if (!result.isSuccess()) { throw new GlusterRuntimeException(result.toString()); } diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/ServerUtil.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/ServerUtil.java index f10feb2a..3b3724da 100644 --- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/ServerUtil.java +++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/ServerUtil.java @@ -76,6 +76,8 @@ public class ServerUtil { command.add(SCRIPT_COMMAND); command.add(getScriptPath(scriptName)); command.addAll(arguments); + //TODO: Remove this debug log before moving to production + // logger.info("Executing script [" + command + "] on server gateway."); return new ProcessUtil().executeCommand(runInForeground, command); } @@ -135,6 +137,8 @@ public class ServerUtil { */ public <T> T executeScriptOnServer(boolean runInForeground, String serverName, String scriptWithArgs, Class<T> expectedClass) { + //TODO: Remove this debug log before moving to production + // logger.info("Executing script [" + scriptWithArgs + "] on server [" + serverName + "]"); return executeOnServer(runInForeground, serverName, getRemoteScriptDir() + File.separator + scriptWithArgs, expectedClass); } |