diff options
| author | Selvasundaram <selvam@gluster.com> | 2011-08-22 20:34:49 +0530 |
|---|---|---|
| committer | Selvasundaram <selvam@gluster.com> | 2011-08-22 20:34:49 +0530 |
| commit | 617eb53e0c6808f9fc3c0504c2631825225ce226 (patch) | |
| tree | 69b9951e6998da4fd3d1c3a958432c70f19f66cc /src/com.gluster.storage.management.gateway | |
| parent | 7b12c934d0ff76ff679bcc98ac67b01956a76cc7 (diff) | |
Replace-brick wont work if volume name contains hyphen - fix
Diffstat (limited to 'src/com.gluster.storage.management.gateway')
| -rw-r--r-- | src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/MigrateBrickTask.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/MigrateBrickTask.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/MigrateBrickTask.java index b84f90f6..4d63e872 100644 --- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/MigrateBrickTask.java +++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/MigrateBrickTask.java @@ -69,7 +69,7 @@ public class MigrateBrickTask extends Task { public MigrateBrickTask(ClusterService clusterService, String clusterName, String volumeName, String fromBrick, String toBrick) { - super(clusterService, clusterName, TASK_TYPE.BRICK_MIGRATE, volumeName + "-" + fromBrick + "-" + toBrick, + super(clusterService, clusterName, TASK_TYPE.BRICK_MIGRATE, volumeName + "#" + fromBrick + "#" + toBrick, "Brick Migration on volume [" + volumeName + "] from [" + fromBrick + "] to [" + toBrick + "]", true, true, true); setFromBrick(fromBrick); @@ -106,7 +106,7 @@ public class MigrateBrickTask extends Task { } private void startMigration(String onlineServerName) { - String volumeName = getTaskInfo().getReference().split("-")[0]; + String volumeName = getTaskInfo().getReference().split("#")[0]; ProcessResult processResult = glusterUtil.executeBrickMigration(onlineServerName, volumeName, getFromBrick(), getToBrick(), "start"); if (processResult.getOutput().trim().matches(".*started successfully$")) { @@ -132,7 +132,7 @@ public class MigrateBrickTask extends Task { } private void pauseMigration(String onlineServer) { - String volumeName = getTaskInfo().getReference().split("-")[0]; + String volumeName = getTaskInfo().getReference().split("#")[0]; ProcessResult processResult = glusterUtil.executeBrickMigration(onlineServer, volumeName, getFromBrick(), getToBrick(), "pause"); TaskStatus taskStatus = new TaskStatus(); @@ -165,7 +165,7 @@ public class MigrateBrickTask extends Task { } private void commitMigration(String serverName) { - String volumeName = getTaskInfo().getReference().split("-")[0]; + String volumeName = getTaskInfo().getReference().split("#")[0]; ProcessResult processResult = glusterUtil.executeBrickMigration(serverName, volumeName, getFromBrick(), getToBrick(), "commit"); TaskStatus taskStatus = new TaskStatus(); @@ -194,7 +194,7 @@ public class MigrateBrickTask extends Task { } private void stopMigration(String serverName) { - String volumeName = getTaskInfo().getReference().split("-")[0]; + String volumeName = getTaskInfo().getReference().split("#")[0]; ProcessResult processResult = glusterUtil.executeBrickMigration(serverName, volumeName, getFromBrick(), getToBrick(), "abort"); TaskStatus taskStatus = new TaskStatus(); @@ -227,7 +227,7 @@ public class MigrateBrickTask extends Task { TaskStatus taskStatus = new TaskStatus(); try { - String volumeName = getTaskInfo().getReference().split("-")[0]; + String volumeName = getTaskInfo().getReference().split("#")[0]; ProcessResult processResult = glusterUtil.executeBrickMigration(serverName, volumeName, getFromBrick(), getToBrick(), "status"); String output = processResult.getOutput().trim(); |