Merge pull request #244 from Dhandapani/master

Bug 3279 - Not able to switch online server if glusterd on current server is down - fixed

1 files changed, 3 insertions, 7 deletions

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 86337a6a..d9c1df3c 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
@@ -135,9 +135,6 @@ public class GlusterUtil {
 
 	public List<GlusterServer> getGlusterServers(GlusterServer knownServer) {
 		String output = getPeerStatus(knownServer.getName());
-		if (output == null) {
-			return null;
-		}
 
 		knownServer.setUuid(getUuid(knownServer.getName()));
 		
@@ -207,13 +204,12 @@ public class GlusterUtil {
 	 * @return Outout of the "gluster peer status" command
 	 */
 	private String getPeerStatus(String knownServer) {
-		String output;
 		ProcessResult result = getSshUtil().executeRemote(knownServer, "gluster peer status");
 		if (!result.isSuccess()) {
-			output = null;
+			throw new GlusterRuntimeException("Couldn't get peer status on server [" + knownServer + "]. Error: "
+					+ result);
 		}
-		output = result.getOutput();
-		return output;
+		return result.getOutput();
 	}
 
 	public void addServer(String existingServer, String newServer) {