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/21 22:15:01 UTC
airavata git commit: Handle cancel reqeust fail in provider instead
parse it to GfacServerHandler
Repository: airavata
Updated Branches:
refs/heads/master d4ccc8711 -> 111d9b599
Handle cancel reqeust fail in provider instead parse it to GfacServerHandler
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/111d9b59
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/111d9b59
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/111d9b59
Branch: refs/heads/master
Commit: 111d9b59957fcc4f71fbce8961d9c0eefb316cb8
Parents: d4ccc87
Author: shamrath <sh...@gmail.com>
Authored: Thu May 21 16:14:55 2015 -0400
Committer: shamrath <sh...@gmail.com>
Committed: Thu May 21 16:14:55 2015 -0400
----------------------------------------------------------------------
.../apache/airavata/gfac/ssh/provider/impl/SSHProvider.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/111d9b59/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 b5c94e2..ada99fb 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
@@ -270,19 +270,19 @@ public class SSHProvider extends AbstractProvider {
throw new GFacProviderException("Cancel request failed to cancel job as JobId is null in Job Execution Context");
}
} catch (SSHApiException e) {
- String error = "Error submitting the job to host " + jobExecutionContext.getHostName() + " message: " + e.getMessage();
+ String error = "Cancel request failed " + jobExecutionContext.getHostName() + " message: " + e.getMessage();
log.error(error);
StringWriter errors = new StringWriter();
e.printStackTrace(new PrintWriter(errors));
GFacUtils.saveErrorDetails(jobExecutionContext, errors.toString(), CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.AIRAVATA_INTERNAL_ERROR);
- throw new GFacProviderException(error, e);
+// throw new GFacProviderException(error, e);
} catch (Exception e) {
- String error = "Error submitting the job to host " + jobExecutionContext.getHostName() + " message: " + e.getMessage();
+ String error = "Cancel request failed " + jobExecutionContext.getHostName() + " message: " + e.getMessage();
log.error(error);
StringWriter errors = new StringWriter();
e.printStackTrace(new PrintWriter(errors));
GFacUtils.saveErrorDetails(jobExecutionContext, errors.toString(), CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.AIRAVATA_INTERNAL_ERROR);
- throw new GFacProviderException(error, e);
+// throw new GFacProviderException(error, e);
}
// we know this host is type GsiSSHHostType
}