From 657496a0036d54e2661f7f84a01d6ef73cf120b0 Mon Sep 17 00:00:00 2001 From: Dhandapani Date: Fri, 29 Apr 2011 16:45:46 +0530 Subject: Story #3: Delete Volume confirmation added. --- .../storage/management/gui/actions/DeleteVolumeAction.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java index 9ddb976a..d5501082 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java @@ -47,7 +47,7 @@ public class DeleteVolumeAction extends AbstractActionDelegate { Integer deleteOption = new MessageDialog(getShell(), "Delete Volume", GUIHelper.getInstance().getImage( IImageKeys.VOLUME), warningMessage, MessageDialog.QUESTION, new String[] { "Cancel", - "Delete volume, keep back-up of data", "Delete volume and it's data" }, 2).open(); + "Delete volume and it's data", "Delete volume, keep back-up of data" }, 2).open(); if (deleteOption == 0) { return; } @@ -63,8 +63,12 @@ public class DeleteVolumeAction extends AbstractActionDelegate { return; } } + String confirmDelete = ""; + if (deleteOption == 1) { + confirmDelete = "-d"; + } - status = client.deleteVolume(volume, deleteOption.toString()); + status = client.deleteVolume(volume, confirmDelete); if (status.isSuccess()) { showInfoDialog(actionDesc, "Volume [" + volume.getName() + "] deleted successfully!"); modelManager.deleteVolume(volume); -- cgit From f78cd85bca61724820b9fe502b97024a578052f1 Mon Sep 17 00:00:00 2001 From: Selvam Date: Fri, 29 Apr 2011 17:11:55 +0530 Subject: Cleanup volume directory enhancement updated in add disk story --- .../management/server/resources/VolumesResource.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src') 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 457776cc..c358460d 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 @@ -112,7 +112,7 @@ public class VolumesResource { status.setMessage("Error while setting volume options: " + optionsStatus); } } else { - Status cleanupStatus = cleanupDirectories(disks, volume.getName(), disks.size()); + Status cleanupStatus = cleanupDirectories(disks, volume.getName(), disks.size(), "-d"); // delete permanently if (!cleanupStatus.isSuccess()) { status.setMessage(status.getMessage() + CoreConstants.NEWLINE + "Cleanup errors: " + CoreConstants.NEWLINE + cleanupStatus); @@ -148,7 +148,7 @@ public class VolumesResource { @Path("{" + PATH_PARAM_VOLUME_NAME + "}") @Produces(MediaType.TEXT_XML) public Status deleteVolume(@QueryParam(QUERY_PARAM_VOLUME_NAME) String volumeName, - @QueryParam(QUERY_PARAM_DELETE_OPTION) int deleteOption) { + @QueryParam(QUERY_PARAM_DELETE_OPTION) String deleteOption) { Volume volume = glusterUtil.getVolume(volumeName); Status status = glusterUtil.deleteVolume(volumeName); @@ -164,7 +164,7 @@ public class VolumesResource { return status; } - private Status postDelete(String volumeName, List disks, int deleteFlag) { + private Status postDelete(String volumeName, List disks, String deleteFlag) { String serverName, diskName, diskInfo[]; Status result; for (int i = 0; i < disks.size(); i++) { @@ -230,7 +230,7 @@ public class VolumesResource { bricks.add(serverName + ":" + brickDir); } else { // Brick preparation failed. Cleanup directories already created and return failure status - Status cleanupStatus = cleanupDirectories(disks, volumeName, i + 1); + Status cleanupStatus = cleanupDirectories(disks, volumeName, i + 1, "-d"); // delete permanently if (!cleanupStatus.isSuccess()) { // append cleanup error to prepare brick error status.setMessage(status.getMessage() + CoreConstants.NEWLINE + cleanupStatus.getMessage()); @@ -252,7 +252,7 @@ public class VolumesResource { } @SuppressWarnings("rawtypes") - private Status cleanupDirectories(List disks, String volumeName, int maxIndex) { + private Status cleanupDirectories(List disks, String volumeName, int maxIndex, String deleteFlag) { String serverName, diskName, diskInfo[]; Status result; for (int i = 0; i < maxIndex; i++) { @@ -260,7 +260,7 @@ public class VolumesResource { serverName = diskInfo[0]; diskName = diskInfo[1]; result = ((GenericResponse) serverUtil.executeOnServer(true, serverName, VOLUME_DIRECTORY_CLEANUP_SCRIPT + " " - + diskName + " " + volumeName, GenericResponse.class)).getStatus(); + + diskName + " " + volumeName + " " + deleteFlag, GenericResponse.class)).getStatus(); if (!result.isSuccess()) { return result; } @@ -333,7 +333,7 @@ public class VolumesResource { status = glusterUtil.addBricks(volumeName, bricks); if (!status.isSuccess()) { - Status cleanupStatus = cleanupDirectories(diskList, volumeName, diskList.size()); + Status cleanupStatus = cleanupDirectories(diskList, volumeName, diskList.size(), "-d"); // Remove the directories if created if (!cleanupStatus.isSuccess()) { // append cleanup error to prepare brick error status.setMessage(status.getMessage() + CoreConstants.NEWLINE + cleanupStatus.getMessage()); @@ -372,7 +372,7 @@ public class VolumesResource { Form form = new Form(); form.add("volumeName", volume.getName()); form.add(RESTConstants.FORM_PARAM_DELETE_OPTION, 1); - Status status = vr.deleteVolume("Vol2", 1); + Status status = vr.deleteVolume("Vol2", "1"); System.out.println("Code : " + status.getCode()); System.out.println("Message " + status.getMessage()); } -- cgit