You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ra...@apache.org on 2014/08/13 23:37:01 UTC
git commit: Tested the null conditon and command check.
Repository: airavata
Updated Branches:
refs/heads/master ff009a11f -> 3721954dd
Tested the null conditon and command check.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3721954d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3721954d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3721954d
Branch: refs/heads/master
Commit: 3721954ddd11632418a19894390d711ccfbf67cc
Parents: ff009a1
Author: raminder <ra...@apache.org>
Authored: Wed Aug 13 17:36:50 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Wed Aug 13 17:36:50 2014 -0400
----------------------------------------------------------------------
.../org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/3721954d/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java
----------------------------------------------------------------------
diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java
index 1cc2df6..937ed9c 100644
--- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java
+++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java
@@ -424,7 +424,8 @@ public class GSISSHAbstractCluster implements Cluster {
}
public void getJobStatuses(String userName, Map<String,JobStatus> jobIDs)throws SSHApiException {
- RawCommandInfo rawCommandInfo = jobManagerConfiguration.getUserBasedMonitorCommand(userName);
+// RawCommandInfo rawCommandInfo = jobManagerConfiguration.getUserBasedMonitorCommand(userName);
+ RawCommandInfo rawCommandInfo = new RawCommandInfo("qstat -u abc");
StandardOutReader stdOutReader = new StandardOutReader();
CommandExecutor.executeCommand(rawCommandInfo, this.getSession(), stdOutReader);
String result = getOutputifAvailable(stdOutReader, "Error getting job information from the resource !", rawCommandInfo.getCommand());
@@ -461,7 +462,7 @@ public class GSISSHAbstractCluster implements Cluster {
String stdErrorString = jobIDReaderCommandOutput.getStdErrorString();
if ((stdOutputString == null || "".equals(stdOutputString)) &&
- ((stdErrorString != null) && (stdErrorString.contains(command)))) {
+ (stdErrorString != null && stdErrorString.contains(command))) {
log.error("Standard Error output : " + stdErrorString);
throw new SSHApiException(errorMsg + stdErrorString);
}