Device mount point handling

Parameter changes for directory cleanup script.
Bug 3297 - Path seperator is appended as "\" instead of "/" if volume is created from windows client - fix

3 files changed, 17 insertions, 17 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 c021aeb2..03a61aae 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
@@ -500,17 +500,18 @@ public class VolumesResource extends AbstractResource {
 			String serverName = brickInfo[0];
 			String brickDirectory = brickInfo[1];
 
+			// String mountPoint = brickDirectory.substring(0,
+			// brickDirectory.lastIndexOf("/"));
 			Object response = serverUtil.executeScriptOnServer(true, serverName, VOLUME_DIRECTORY_CLEANUP_SCRIPT + " "
-					+ brickDirectory + " " + volumeName + " " + (deleteFlag ? "-d" : ""), GenericResponse.class);
+					+ brickDirectory + " " + (deleteFlag ? "-d" : ""), GenericResponse.class);
 			if (response instanceof GenericResponse) {
 				result = ((GenericResponse) response).getStatus();
 				if (!result.isSuccess()) {
-					errors += "[" + brickDirectory + "][" + volumeName + "] => " + result
-							+ CoreConstants.NEWLINE;
+					errors += "[" + brickDirectory + "] => " + result + CoreConstants.NEWLINE;
 				}
 			} else {
 				Status errStatus = (Status) response;
-				errors += "[" + brickDirectory + "][" + volumeName + "] => " + errStatus + CoreConstants.NEWLINE;
+				errors += "[" + brickDirectory + "] => " + errStatus + CoreConstants.NEWLINE;
 			}
 		}
 		if(!errors.trim().isEmpty()) {
@@ -522,10 +523,11 @@ public class VolumesResource extends AbstractResource {
 		Status result;
 		for (Brick brick : bricks) {
 			String brickDirectory = brick.getBrickDirectory();
+			// String mountPoint = brickDirectory.substring(0, brickDirectory.lastIndexOf("/"));
 
 			result = (Status) serverUtil.executeScriptOnServer(true, brick.getServerName(),
-					VOLUME_DIRECTORY_CLEANUP_SCRIPT + " " + brickDirectory + " " + volumeName
-							+ (deleteFlag ? " -d" : ""), Status.class);
+					VOLUME_DIRECTORY_CLEANUP_SCRIPT + " " + brickDirectory + " " + (deleteFlag ? "-d" : ""),
+					Status.class);
 			if (!result.isSuccess()) {
 				throw new GlusterRuntimeException("Error in post-delete operation of volume [" + volumeName + "]: "
 						+ result);
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/ClusterService.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/ClusterService.java
index e01c5096..368b34f5 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/ClusterService.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/ClusterService.java
@@ -31,9 +31,7 @@ import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.exceptions.ConnectionException;
 import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
 import com.gluster.storage.management.core.utils.LRUCache;
-import com.gluster.storage.management.core.utils.ProcessResult;
 import com.gluster.storage.management.gateway.data.ClusterInfo;
 import com.gluster.storage.management.gateway.data.PersistenceDao;
 import com.gluster.storage.management.gateway.data.ServerInfo;
@@ -76,7 +74,7 @@ public class ClusterService {
 	// uses cache
 	public GlusterServer getOnlineServer(String clusterName, String exceptServerName) {
 		GlusterServer server = onlineServerCache.get(clusterName);
-		if (server != null && !server.getName().equals(exceptServerName)) {
+		if (server != null && !server.getName().equalsIgnoreCase(exceptServerName)) {
 			return server;
 		}
 
@@ -103,7 +101,7 @@ public class ClusterService {
 			try {
 				serverUtil.fetchServerDetails(server); // Online status come with server details
 				// server is online. add it to cache and return
-				if (server.isOnline() && !server.getName().equals(exceptServerName)) {
+				if (server.isOnline() && !server.getName().equalsIgnoreCase(exceptServerName)) {
 					addOnlineServer(clusterName, server);
 					return server;
 				}
@@ -251,7 +249,7 @@ public class ClusterService {
 		ClusterInfo cluster = getCluster(clusterName);
 		List<ServerInfo> servers = cluster.getServers();
 		for(ServerInfo server : servers) {
-			if(server.getName().equals(serverName)) {
+			if(server.getName().equalsIgnoreCase(serverName)) {
 				servers.remove(server);
 				clusterDao.delete(server);
 				break;
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java
index 55909d54..54f723e9 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java
@@ -25,7 +25,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.regex.Pattern;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -113,7 +112,7 @@ public class GlusterUtil {
 	public GlusterServer getGlusterServer(GlusterServer onlineServer, String serverName) {
 		List<GlusterServer> servers = getGlusterServers(onlineServer);
 		for (GlusterServer server : servers) {
-			if (server.getName().equals(serverName)) {
+			if (server.getName().equalsIgnoreCase(serverName)) {
 				return server;
 			}
 		}
@@ -412,11 +411,11 @@ public class GlusterUtil {
 
 	private void addBrickToVolume(Volume volume, String serverName, String brickDir, BRICK_STATUS status) {
 		//If brick directory has standard path, find and assign device name otherwise null
-		String stdBrickDirPattern = "^/export/.*/.*"; // e.g: /export/sdb/test
+//		String stdBrickDirPattern = "^/export/.*/.*"; // e.g: /export/sdb/test
 		String deviceName = null;
-		if (Pattern.matches(stdBrickDirPattern, brickDir) ) {
-			deviceName = brickDir.split("/")[2].trim();
-		}
+//		if (Pattern.matches(stdBrickDirPattern, brickDir) ) {
+//			deviceName = brickDir.split("/")[2].trim();
+//		}
 		volume.addBrick(new Brick(serverName, status, deviceName, brickDir));
 	}
 	
@@ -561,6 +560,7 @@ public class GlusterUtil {
 				+ "] doesn't start with prefix [" + VOLUME_LOG_LOCATION_PFX + "]");
 	}
 
+	//TODO File.separator should be changed if gateway runs on windows/mac
 	public String getLogFileNameForBrickDir(String brickDir) {
 		String logFileName = brickDir;
 		if (logFileName.startsWith(File.separator)) {