diff options
Diffstat (limited to 'src')
2 files changed, 13 insertions, 9 deletions
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 3e89b8ca..c9ae0fe5 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 @@ -89,7 +89,6 @@ import com.gluster.storage.management.core.exceptions.GlusterRuntimeException; import com.gluster.storage.management.core.model.Brick; import com.gluster.storage.management.core.model.GlusterServer; import com.gluster.storage.management.core.model.Status; -import com.gluster.storage.management.core.model.TaskInfo; import com.gluster.storage.management.core.model.Volume; import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE; import com.gluster.storage.management.core.model.VolumeLogMessage; @@ -101,6 +100,7 @@ import com.gluster.storage.management.core.utils.DateUtil; import com.gluster.storage.management.core.utils.FileUtil; import com.gluster.storage.management.core.utils.ProcessUtil; import com.gluster.storage.management.server.constants.VolumeOptionsDefaults; +import com.gluster.storage.management.server.data.ClusterInfo; import com.gluster.storage.management.server.services.ClusterService; import com.gluster.storage.management.server.tasks.MigrateDiskTask; import com.gluster.storage.management.server.tasks.RebalanceVolumeTask; @@ -147,9 +147,15 @@ public class VolumesResource extends AbstractResource { return badRequestResponse("Cluster name must not be empty!"); } - if (clusterService.getCluster(clusterName) == null) { + ClusterInfo cluster = clusterService.getCluster(clusterName); + if (cluster == null) { return notFoundResponse("Cluster [" + clusterName + "] not found!"); } + + if(cluster.getServers().size() == 0) { + // no server added yet. return an empty array. + return okResponse(new VolumeListResponse(), mediaType); + } return okResponse(getVolumes(clusterName), mediaType); } diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/SshUtil.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/SshUtil.java index d15142e6..2ebf011b 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/SshUtil.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/SshUtil.java @@ -20,13 +20,11 @@ package com.gluster.storage.management.server.utils; import java.io.BufferedReader; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.util.Arrays; -import java.util.Date; import org.springframework.stereotype.Component; @@ -270,7 +268,7 @@ public class SshUtil { readFromStream(stderrReader, output); } - return prepareProcessResult(session, condition, output); + return prepareProcessResult(session, condition, output.toString().trim()); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -278,17 +276,17 @@ public class SshUtil { } } - private ProcessResult prepareProcessResult(Session session, int condition, StringBuilder output) { + private ProcessResult prepareProcessResult(Session session, int condition, String output) { ProcessResult result = null; if (wasTerminated(condition)) { - result = new ProcessResult(ProcessResult.FAILURE, output.toString()); + result = new ProcessResult(ProcessResult.FAILURE, output); } else { if (hasErrors(condition, session)) { Integer exitStatus = session.getExitStatus(); int statusCode = (exitStatus == null ? ProcessResult.FAILURE : exitStatus); - result = new ProcessResult(statusCode, output.toString()); + result = new ProcessResult(statusCode, output); } else { - result = new ProcessResult(ProcessResult.SUCCESS, output.toString()); + result = new ProcessResult(ProcessResult.SUCCESS, output); } } return result; |