From 0d55d9f84d9a6dd9d6150f0af3250911cd0853c2 Mon Sep 17 00:00:00 2001 From: Selvasundaram Date: Wed, 17 Aug 2011 22:07:36 +0530 Subject: Stop cifs re-export called after deleting volume cifs config issue - fix --- .../gluster/storage/management/gateway/services/VolumeService.java | 2 -- .../src/com/gluster/storage/management/gateway/utils/ServerUtil.java | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src') 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 executeScriptOnServer(boolean runInForeground, String serverName, String scriptWithArgs, Class 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); } -- cgit