diff options
| author | Dhandapani <dhandapani@gluster.com> | 2011-06-08 12:08:39 +0530 |
|---|---|---|
| committer | Dhandapani <dhandapani@gluster.com> | 2011-06-08 14:36:32 +0530 |
| commit | e9423cfc1b12efe93ec8ee34e3a736abfac37a6c (patch) | |
| tree | 55ce6e35df141aed1df20afd7506ca6827d03e7f /src/com.gluster.storage.management.server | |
| parent | b7116e8ac18641215337d5691cb50b6706f0e91f (diff) | |
| parent | 55ab23c6d34435c264f1c756abf74c6f06e8566e (diff) | |
Merge branch 'master' of git@github.com:gluster/console
Diffstat (limited to 'src/com.gluster.storage.management.server')
2 files changed, 11 insertions, 9 deletions
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/GlusterServersResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/GlusterServersResource.java index 7de9015d..728da2dc 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/GlusterServersResource.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/GlusterServersResource.java @@ -206,7 +206,11 @@ public class GlusterServersResource extends AbstractServersResource { Status status; try { - status = glusterUtil.addServer(serverName, onlineServer.getName()); + status = glusterUtil.addServer(onlineServer.getName(), serverName); + if(status.isSuccess()) { + // other peer probe to ensure that host names appear in peer probe on both sides + status = glusterUtil.addServer(serverName, onlineServer.getName()); + } } catch(ConnectionException e) { onlineServer = getNewOnlineServer(clusterName); if(onlineServer == null) { @@ -307,7 +311,7 @@ public class GlusterServersResource extends AbstractServersResource { } try { - return glusterUtil.removeServer(onlineServer.getName(), serverName); + status = glusterUtil.removeServer(onlineServer.getName(), serverName); } catch (ConnectionException e) { // online server has gone offline! try with a different one. onlineServer = getNewOnlineServer(clusterName, serverName); diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java index 8df8d5c4..d6c41475 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java @@ -69,8 +69,6 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.StreamingOutput; -import org.springframework.beans.factory.annotation.Autowired; - import com.gluster.storage.management.core.constants.CoreConstants; import com.gluster.storage.management.core.constants.RESTConstants; import com.gluster.storage.management.core.exceptions.ConnectionException; @@ -106,20 +104,20 @@ public class VolumesResource { @InjectParam private GlusterServersResource glusterServersResource; - @Autowired + @InjectParam private ServerUtil serverUtil; - @Autowired + @InjectParam private GlusterUtil glusterUtil; - @Autowired + @InjectParam private ClusterService clusterService; - private FileUtil fileUtil = new FileUtil(); - @InjectParam private VolumeOptionsDefaults volumeOptionsDefaults; + private FileUtil fileUtil = new FileUtil(); + @GET @Produces(MediaType.TEXT_XML) public VolumeListResponse getAllVolumes(@PathParam(PATH_PARAM_CLUSTER_NAME) String clusterName) { |