From 9103396299d6ab0966a76cb95db6517b81dbdcbf Mon Sep 17 00:00:00 2001 From: Dhandapani Date: Wed, 17 Aug 2011 18:41:48 +0530 Subject: Bug 3279 - Not able to switch online server if glusterd on current server is down - fixed Bug 3424 - Glusterd stop after license expiry does not show server as offline in GUI - fixed --- .../gluster/storage/management/gateway/utils/GlusterUtil.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src') 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 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) { -- cgit