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);
 	}