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/09/26 20:20:01 UTC
git commit: Fixed AIRAVATA-1453 to retry 3 times
Repository: airavata
Updated Branches:
refs/heads/master 45e0185cc -> bf8f3d0c9
Fixed AIRAVATA-1453 to retry 3 times
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/bf8f3d0c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/bf8f3d0c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/bf8f3d0c
Branch: refs/heads/master
Commit: bf8f3d0c95b656b87e06d5b6b613ddb5ea7ea7de
Parents: 45e0185
Author: raminder <ra...@apache.org>
Authored: Fri Sep 26 14:19:15 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Fri Sep 26 14:19:15 2014 -0400
----------------------------------------------------------------------
.../gfac/gsissh/handler/GSISSHInputHandler.java | 18 ++++++++++++++++--
.../gfac/ssh/handler/SSHInputHandler.java | 18 ++++++++++++++++--
2 files changed, 32 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/bf8f3d0c/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java
index 3d9d65c..726f609 100644
--- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java
+++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java
@@ -177,9 +177,23 @@ public class GSISSHInputHandler extends AbstractRecoverableHandler {
if (paramValue.startsWith("file")) {
paramValue = paramValue.substring(paramValue.indexOf(":") + 1, paramValue.length());
}
- cluster.scpTo(targetFile, paramValue);
+ boolean success = false;
+ int j = 1;
+ while(!success){
+ try {
+ cluster.scpTo(targetFile, paramValue);
+ success = true;
+ } catch (Exception e) {
+ log.info(e.getLocalizedMessage());
+ Thread.sleep(2000);
+ if(j==3) {
+ throw new GFacHandlerException("Error while input File Staging", e, e.getLocalizedMessage());
+ }
+ }
+ j++;
+ }
return targetFile;
- } catch (SSHApiException e) {
+ } catch (Exception e) {
throw new GFacHandlerException("Error while input File Staging", e, e.getLocalizedMessage());
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/bf8f3d0c/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java
index d551650..994a670 100644
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java
@@ -161,10 +161,24 @@ public class SSHInputHandler extends AbstractHandler {
if(paramValue.startsWith("file")){
paramValue = paramValue.substring(paramValue.indexOf(":") + 1, paramValue.length());
}
- cluster.scpTo(targetFile, paramValue);
+ boolean success = false;
+ int j = 1;
+ while(!success){
+ try {
+ cluster.scpTo(targetFile, paramValue);
+ success = true;
+ } catch (Exception e) {
+ log.info(e.getLocalizedMessage());
+ Thread.sleep(2000);
+ if(j==3) {
+ throw new GFacHandlerException("Error while input File Staging", e, e.getLocalizedMessage());
+ }
+ }
+ j++;
+ }
}
return targetFile;
- } catch (SSHApiException e) {
+ } catch (Exception e) {
throw new GFacHandlerException("Error while input File Staging", e, e.getLocalizedMessage());
}
}