airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject git commit: Fixing issues regarding failured submission - AIRAVATA-1023
Date Tue, 11 Mar 2014 19:55:50 GMT
Repository: airavata
Updated Branches:
  refs/heads/master c00025f49 -> fc8f9681d


Fixing issues regarding failured submission - AIRAVATA-1023


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/fc8f9681
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fc8f9681
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fc8f9681

Branch: refs/heads/master
Commit: fc8f9681ddded80cb660fc6f7e1f4924b2fc8cf7
Parents: c00025f
Author: lahiru <lahiru@apache.org>
Authored: Tue Mar 11 15:55:43 2014 -0400
Committer: lahiru <lahiru@apache.org>
Committed: Tue Mar 11 15:55:43 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/airavata/client/tools/DocumentCreator.java     | 2 +-
 .../org/apache/airavata/gfac/provider/impl/GSISSHProvider.java     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/fc8f9681/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java
b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java
index c470ad8..7504cb5 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java
@@ -633,7 +633,7 @@ public class DocumentCreator {
         ((GsisshHostType) host.getType()).setJobManager("slurm");
         ((GsisshHostType) host.getType()).setInstalledPath("/usr/bin/");
         ((GsisshHostType) host.getType()).setPort(2222);
-        ((GsisshHostType) host.getType()).setMonitorMode("push");
+//        ((GsisshHostType) host.getType()).setMonitorMode("push");
 //        ((GsisshHostType) host.getType()).setMo(2222);
 
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/fc8f9681/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GSISSHProvider.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GSISSHProvider.java
b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GSISSHProvider.java
index 683a2b5..db5c29a 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GSISSHProvider.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GSISSHProvider.java
@@ -173,12 +173,14 @@ public class GSISSHProvider extends AbstractProvider implements GFacProvider{
         } catch (SSHApiException e) {
             String error = "Error submitting the job to host " + host.getHostAddress() +
e.getMessage();
             log.error(error);
+            jobDetails.setJobID("none");
         	GFacUtils.saveJobStatus(jobDetails,JobState.FAILED,taskID);
          	GFacUtils.saveErrorDetails(error, CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.AIRAVATA_INTERNAL_ERROR,
taskID);
             throw new GFacProviderException(error, e);
         } catch (Exception e) {
         	String error = "Error submitting the job to host " + host.getHostAddress() + e.getMessage();
          	log.error(error);
+            jobDetails.setJobID("none");
         	GFacUtils.saveJobStatus(jobDetails,JobState.FAILED,taskID);
          	GFacUtils.saveErrorDetails(error, CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.AIRAVATA_INTERNAL_ERROR,
taskID);
             throw new GFacProviderException(error, e);


Mime
View raw message