diff options
2 files changed, 10 insertions, 4 deletions
diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickWizard.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickWizard.java index e86b4020..7baae6b5 100644 --- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickWizard.java +++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickWizard.java @@ -64,7 +64,7 @@ public class MigrateBrickWizard extends Wizard { String dialogTitle = "Brick migration"; try { - String reference = volume.getName() + "-" + sourceDir + "-" + targetDir; + String reference = volume.getName() + "#" + sourceDir + "#" + targetDir; TaskInfo existingTaskInfo = GlusterDataModelManager.getInstance().getTaskByReference(reference); if (existingTaskInfo != null && existingTaskInfo.getStatus().getCode() != Status.STATUS_CODE_SUCCESS && existingTaskInfo.getStatus().getCode() != Status.STATUS_CODE_FAILURE) { diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/MigrateBrickTask.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/MigrateBrickTask.java index 6cf4777d..7e61f615 100644 --- a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/MigrateBrickTask.java +++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/MigrateBrickTask.java @@ -96,7 +96,7 @@ public class MigrateBrickTask extends Task { // online server might have gone Offline. try with a new one. startMigration(getNewOnlineServer().getName()); } else { - throw new GlusterRuntimeException(e.getMessage()); + throw new GlusterRuntimeException("Error while starting migration!", e); } } } @@ -105,6 +105,7 @@ public class MigrateBrickTask extends Task { String volumeName = getTaskInfo().getReference().split("#")[0]; glusterInterface.startBrickMigration(onlineServerName, volumeName, getFromBrick(), getToBrick()); getTaskInfo().setStatus(new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, "Brick Migration Started."))); + System.out.println(getTaskInfo().getStatus().toString()); } @Override @@ -193,9 +194,14 @@ public class MigrateBrickTask extends Task { if (e instanceof ConnectionException || serverUtil.isServerOnline(getOnlineServer()) == false) { // online server might have gone offline. try with a new one. return checkMigrationStatus(getNewOnlineServer().getName()); - } + } else { + if(e instanceof GlusterRuntimeException) { + throw ((GlusterRuntimeException)e); + } else { + throw new GlusterRuntimeException("Exception while checking brick migration status!", e); + } + } } - return null; } private TaskStatus checkMigrationStatus(String serverName) { |