From c0a91164dbc80e4d5259c02f169bf8020fc85c39 Mon Sep 17 00:00:00 2001 From: Shireesh Anjal Date: Wed, 24 Aug 2011 14:15:58 +0530 Subject: Modified method removeServerFromCluster to unmap the server from cluster as soon as peer detach is successful. --- .../management/gateway/services/GlusterServerService.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterServerService.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterServerService.java index f80d68ac..6cdcd377 100644 --- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterServerService.java +++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterServerService.java @@ -315,6 +315,12 @@ public class GlusterServerService { } } + clusterService.unmapServerFromCluster(clusterName, serverName); + + // since the server is removed from the cluster, it is now available to be added to other clusters. + // Hence add it back to the discovered servers list. + discoveredServerService.addDiscoveredServer(serverName); + try { if (serverUtil.isServerOnline(new Server(serverName))) { volumeService.clearCifsConfiguration(clusterName, onlineServer.getName(), serverName); @@ -328,13 +334,7 @@ public class GlusterServerService { // since the cached server has been removed from the cluster, remove it from the cache clusterService.removeOnlineServer(clusterName); } - - // since the server is removed from the cluster, it is now available to be added to other clusters. - // Hence add it back to the discovered servers list. - discoveredServerService.addDiscoveredServer(serverName); } - - clusterService.unmapServerFromCluster(clusterName, serverName); } private boolean containsServer(List servers, String serverName) { -- cgit