diff options
| author | Dhandapani <dhandapani@gluster.com> | 2011-06-23 12:08:33 +0530 |
|---|---|---|
| committer | Dhandapani <dhandapani@gluster.com> | 2011-06-23 12:08:33 +0530 |
| commit | 08935b7b56b97bc041d1ec42a5ae51cb68ec50a8 (patch) | |
| tree | 4769eca96bf68d305e8a81f4c5cc85a0a461efd3 | |
| parent | dc9006106dd12324119d04796b5b054555ab82a8 (diff) | |
| parent | 31fb6f106e6626ffd922139186cff1ed0e2adc95 (diff) | |
Merge branch 'initialize-disk'
Conflicts:
src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitializeDiskTask.java
| -rw-r--r-- | src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitializeDiskTask.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitializeDiskTask.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitializeDiskTask.java index ef89a2a8..4c719de2 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitializeDiskTask.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitializeDiskTask.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD:src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitializeDiskTask.java * MigrateDiskTask.java +======= + * InitializeDiskTask.java +>>>>>>> initialize-disk:src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitializeDiskTask.java * * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com> * This file is part of Gluster Management Console. @@ -28,6 +32,9 @@ import com.gluster.storage.management.server.utils.SshUtil; public class InitializeDiskTask extends Task { + private static final String INITIALIZE_DISK_SCRIPT = "initialize_disk.py"; + private static final String INITIALIZE_DISK_STATUS_SCRIPT = "initialize_disk_status.py"; + private String serverName; private String diskName; private SshUtil sshUtil = new SshUtil(); @@ -82,7 +89,7 @@ public class InitializeDiskTask extends Task { @Override public TaskInfo start() { getTaskInfo().setStatus( - new TaskStatus(new Status(sshUtil.executeRemote(getServerName(), "initialize_disk.py " + new TaskStatus(new Status(sshUtil.executeRemote(getServerName(), INITIALIZE_DISK_SCRIPT + " " + getDiskName())))); return getTaskInfo(); } @@ -90,7 +97,8 @@ public class InitializeDiskTask extends Task { @Override public TaskInfo status() { getTaskInfo().setStatus( - new TaskStatus(new Status(sshUtil.executeRemote(getServerName(), "initialize_disk_status.py " + + new TaskStatus(new Status(sshUtil.executeRemote(getServerName(), INITIALIZE_DISK_STATUS_SCRIPT + " " + getDiskName())))); return getTaskInfo(); } |