diff options
| author | Shireesh Anjal <shireesh@gluster.com> | 2011-08-03 21:53:33 +0530 |
|---|---|---|
| committer | Shireesh Anjal <shireesh@gluster.com> | 2011-08-03 21:53:33 +0530 |
| commit | 0e6a1ee1ab9025656835baa3d6a4572faeeaf8a7 (patch) | |
| tree | 70cebb0c9486429fa346b51474da4e1a8358eae9 | |
| parent | b57ed7163a6225acc1416ea38677aaee00dc495b (diff) | |
Modified to correctly handle error conditions in case of remove brick
| -rw-r--r-- | src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java index 923293fd..f72a6a64 100644 --- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java +++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java @@ -676,16 +676,10 @@ public class VolumesResource extends AbstractResource { // String mountPoint = brickDirectory.substring(0, // brickDirectory.lastIndexOf("/")); - Object response = serverUtil.executeScriptOnServer(true, serverName, VOLUME_DIRECTORY_CLEANUP_SCRIPT + " " - + brickDirectory + " " + (deleteFlag ? "-d" : ""), GenericResponse.class); - if (response instanceof GenericResponse) { - result = ((GenericResponse) response).getStatus(); - if (!result.isSuccess()) { - errors += "[" + brickDirectory + "] => " + result + CoreConstants.NEWLINE; - } - } else { - Status errStatus = (Status) response; - errors += "[" + brickDirectory + "] => " + errStatus + CoreConstants.NEWLINE; + Object output = serverUtil.executeScriptOnServer(true, serverName, VOLUME_DIRECTORY_CLEANUP_SCRIPT + " " + + brickDirectory + " " + (deleteFlag ? "-d" : ""), String.class); + if (output instanceof Status) { + errors += "[" + brickDirectory + "] => " + output + CoreConstants.NEWLINE; } } if(!errors.trim().isEmpty()) { |