diff options
| author | Dhandapani <dhandapani@gluster.com> | 2011-06-10 12:04:06 +0530 |
|---|---|---|
| committer | Dhandapani <dhandapani@gluster.com> | 2011-06-10 14:09:44 +0530 |
| commit | 7e460734791cf51b16161c6cb42474c0c8cf5d17 (patch) | |
| tree | 89e6db881597f52532a3289d907d6612502a227b /src | |
| parent | 136fddd058fb8f7c6e98e27f17f7379b96760a2e (diff) | |
Checkbox selection enabled on Bricks page, Volumes page and Disk page
Diffstat (limited to 'src')
| -rw-r--r-- | src/com.gluster.storage.management.gui/plugin.xml | 2 | ||||
| -rw-r--r-- | src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/com.gluster.storage.management.gui/plugin.xml b/src/com.gluster.storage.management.gui/plugin.xml index 76d36d5c..4a7cdafe 100644 --- a/src/com.gluster.storage.management.gui/plugin.xml +++ b/src/com.gluster.storage.management.gui/plugin.xml @@ -900,7 +900,7 @@ </view> <view closeable="false" - id="com.gluster.storage.management.gui.views.VolumeDisksView" + id="com.gluster.storage.management.gui.views.VolumeBricksView" minimized="false" moveable="false" ratio="0.30f" 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 53354706..c8796d27 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 @@ -371,17 +371,16 @@ public class VolumesResource { } @SuppressWarnings("rawtypes") - private Status cleanupDirectories(List<String> disks, String volumeName, int maxIndex, boolean deleteFlag) { - String serverName, diskName, diskInfo[]; + private Status cleanupDirectories(List<String> bricks, String volumeName, int maxIndex, boolean deleteFlag) { Status result; for (int i = 0; i < maxIndex; i++) { - diskInfo = disks.get(i).split(":"); - serverName = diskInfo[0]; - diskName = diskInfo[1]; + String[] brickInfo = bricks.get(i).split(":"); + String serverName = brickInfo[0]; + String brickDirectory = brickInfo[1]; + String mountPoint = brickDirectory.substring(0, brickDirectory.lastIndexOf("/")); Object response = serverUtil.executeOnServer(true, serverName, VOLUME_DIRECTORY_CLEANUP_SCRIPT + " " - + diskName.substring(0, diskName.lastIndexOf("/")) + " " + volumeName + " " - + (deleteFlag ? "-d" : ""), GenericResponse.class); + + mountPoint + " " + volumeName + " " + (deleteFlag ? "-d" : ""), GenericResponse.class); if (response instanceof GenericResponse) { result = ((GenericResponse) response).getStatus(); if (!result.isSuccess()) { |