You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/05/14 22:41:39 UTC
airavata git commit: Handled UGE Aborted email and log
CommandExecutor command.
Repository: airavata
Updated Branches:
refs/heads/master 41cb87a9f -> ae129dd21
Handled UGE Aborted email and log CommandExecutor command.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ae129dd2
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ae129dd2
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ae129dd2
Branch: refs/heads/master
Commit: ae129dd218b2d7ea6d0fc4f0342bb90ee364a432
Parents: 41cb87a
Author: shamrath <sh...@gmail.com>
Authored: Thu May 14 16:41:37 2015 -0400
Committer: shamrath <sh...@gmail.com>
Committed: Thu May 14 16:41:37 2015 -0400
----------------------------------------------------------------------
.../airavata/gfac/monitor/email/parser/UGEEmailParser.java | 3 +++
.../apache/airavata/gfac/ssh/provider/impl/SSHProvider.java | 1 +
.../apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java | 6 ++++++
3 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ae129dd2/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/parser/UGEEmailParser.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/parser/UGEEmailParser.java b/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/parser/UGEEmailParser.java
index bbd81a8..02209f4 100644
--- a/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/parser/UGEEmailParser.java
+++ b/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/parser/UGEEmailParser.java
@@ -41,6 +41,7 @@ public class UGEEmailParser implements EmailParser{
public static final String COMPLETE = "Complete";
public static final String FAILED = "Failed";
private static final String REGEX_EXIT_STATUS = "Exit Status[ ]*=[ ]*(?<" + EXIT_STATUS + ">[\\d]+)";
+ public static final String ABORTED = "Aborted";
@Override
@@ -79,6 +80,8 @@ public class UGEEmailParser implements EmailParser{
}
case FAILED:
return JobState.FAILED;
+ case ABORTED:
+ return JobState.FAILED;
default:
return JobState.UNKNOWN;
http://git-wip-us.apache.org/repos/asf/airavata/blob/ae129dd2/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java
index 5cb111a..23ddc90 100644
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java
@@ -133,6 +133,7 @@ public class SSHProvider extends AbstractProvider {
details.setJobDescription(executable);
RawCommandInfo rawCommandInfo = new RawCommandInfo("/bin/chmod 755 " + executable + "; " + executable);
StandardOutReader jobIDReaderCommandOutput = new StandardOutReader();
+ log.info("Executing RawCommand : " + rawCommandInfo.getCommand());
CommandExecutor.executeCommand(rawCommandInfo, cluster.getSession(), jobIDReaderCommandOutput);
String stdOutputString = getOutputifAvailable(jobIDReaderCommandOutput, "Error submitting job to resource");
log.info("stdout=" + stdOutputString);
http://git-wip-us.apache.org/repos/asf/airavata/blob/ae129dd2/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 9357706..3c2293d 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
@@ -240,6 +240,7 @@ public class GSISSHAbstractCluster implements Cluster {
RawCommandInfo rawCommandInfo = jobManagerConfiguration.getCancelCommand(jobID);
StandardOutReader stdOutReader = new StandardOutReader();
+ log.info("Executing RawCommand : " + rawCommandInfo.getCommand());
CommandExecutor.executeCommand(rawCommandInfo, this.getSession(), stdOutReader);
String outputifAvailable = getOutputifAvailable(stdOutReader, "Error reading output of job submission",jobManagerConfiguration.getBaseCancelCommand());
// this might not be the case for all teh resources, if so Cluster implementation can override this method
@@ -269,6 +270,7 @@ public class GSISSHAbstractCluster implements Cluster {
RawCommandInfo rawCommandInfo = jobManagerConfiguration.getSubmitCommand(workingDirectory,scriptPath);
StandardOutReader standardOutReader = new StandardOutReader();
+ log.info("Executing RawCommand : " + rawCommandInfo.getCommand());
CommandExecutor.executeCommand(rawCommandInfo, this.session, standardOutReader);
//Check whether pbs submission is successful or not, if it failed throw and exception in submitJob method
@@ -410,6 +412,7 @@ public class GSISSHAbstractCluster implements Cluster {
public synchronized JobDescriptor getJobDescriptorById(String jobID) throws SSHApiException {
RawCommandInfo rawCommandInfo = jobManagerConfiguration.getMonitorCommand(jobID);
StandardOutReader stdOutReader = new StandardOutReader();
+ log.info("Executing RawCommand : " + rawCommandInfo.getCommand());
CommandExecutor.executeCommand(rawCommandInfo, this.getSession(), stdOutReader);
String result = getOutputifAvailable(stdOutReader, "Error getting job information from the resource !",jobManagerConfiguration.getBaseMonitorCommand());
JobDescriptor jobDescriptor = new JobDescriptor();
@@ -420,6 +423,7 @@ public class GSISSHAbstractCluster implements Cluster {
public synchronized JobStatus getJobStatus(String jobID) throws SSHApiException {
RawCommandInfo rawCommandInfo = jobManagerConfiguration.getMonitorCommand(jobID);
StandardOutReader stdOutReader = new StandardOutReader();
+ log.info("Executing RawCommand : " + rawCommandInfo.getCommand());
CommandExecutor.executeCommand(rawCommandInfo, this.getSession(), stdOutReader);
String result = getOutputifAvailable(stdOutReader, "Error getting job information from the resource !", jobManagerConfiguration.getBaseMonitorCommand());
return jobManagerConfiguration.getParser().parseJobStatus(jobID, result);
@@ -429,6 +433,7 @@ public class GSISSHAbstractCluster implements Cluster {
public String getJobIdByJobName(String jobName, String userName) throws SSHApiException {
RawCommandInfo rawCommandInfo = jobManagerConfiguration.getJobIdMonitorCommand(jobName, userName);
StandardOutReader stdOutReader = new StandardOutReader();
+ log.info("Executing RawCommand : " + rawCommandInfo.getCommand());
CommandExecutor.executeCommand(rawCommandInfo, this.getSession(), stdOutReader);
String result = getOutputifAvailable(stdOutReader, "Error getting job information from the resource !",
jobManagerConfiguration.getJobIdMonitorCommand(jobName,userName).getCommand());
@@ -633,6 +638,7 @@ public class GSISSHAbstractCluster implements Cluster {
StandardOutReader stdOutReader = new StandardOutReader();
while (retry > 0){
try {
+ log.info("Executing RawCommand : " + rawCommandInfo.getCommand());
CommandExecutor.executeCommand(rawCommandInfo, this.getSession(), stdOutReader);
retry=0;
} catch (SSHApiException e) {