summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDhandapani <dhandapani@gluster.com>2011-06-23 12:08:33 +0530
committerDhandapani <dhandapani@gluster.com>2011-06-23 12:10:08 +0530
commit7bd855aa87b161ad04a72ac54c366cdff9bc9fa8 (patch)
tree9f06b455eced236e7208b942ef2012bf6c1600f2
parentdc9006106dd12324119d04796b5b054555ab82a8 (diff)
parent31fb6f106e6626ffd922139186cff1ed0e2adc95 (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.java10
1 files changed, 7 insertions, 3 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..d29d859b 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,5 @@
/**
- * MigrateDiskTask.java
+ * InitializeDiskTask.java
*
* Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
* This file is part of Gluster Management Console.
@@ -28,6 +28,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 +85,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 +93,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();
}