diff options
Diffstat (limited to 'src')
2 files changed, 2 insertions, 3 deletions
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java index 0d4ef85c..c85cdffd 100644 --- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java +++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java @@ -78,7 +78,7 @@ public class DiscoveredServersClient extends AbstractClient { UsersClient usersClient = new UsersClient(); try { usersClient.authenticate("gluster", "gluster"); - DiscoveredServersClient serverResource = new DiscoveredServersClient(usersClient.getSecurityToken()); + DiscoveredServersClient serverResource = new DiscoveredServersClient(usersClient.getSecurityToken(), "new"); List<String> discoveredServerNames = serverResource.getDiscoveredServerNames(); System.out.println(discoveredServerNames); List<Server> discoveredServers = serverResource.getDiscoveredServerDetails(); diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GlusterServersResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GlusterServersResource.java index b97d47f8..43708239 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GlusterServersResource.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GlusterServersResource.java @@ -354,6 +354,7 @@ public class GlusterServersResource extends AbstractServersResource { return errorResponse(e.getMessage()); } } + clusterService.unmapServerFromCluster(clusterName, serverName); return noContentResponse(); } @@ -381,8 +382,6 @@ public class GlusterServersResource extends AbstractServersResource { clusterService.removeOnlineServer(clusterName); } - 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. discoveredServersResource.addDiscoveredServer(serverName); |