Repository: airavata Updated Branches: refs/heads/master 9018dc8b6 -> 71de39d9e
Moved to a static connection map. This is better as we will use one ssh connection for all the jobs. AIRAVATA-1456 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/71de39d9 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/71de39d9 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/71de39d9 Branch: refs/heads/master Commit: 71de39d9eb7532c92357e28bedfaffda76002b45 Parents: 9018dc8 Author: raminder <[email protected]> Authored: Mon Sep 29 16:08:32 2014 -0400 Committer: raminder <[email protected]> Committed: Mon Sep 29 16:08:32 2014 -0400 ---------------------------------------------------------------------- .../gfac/gsissh/handler/GSISSHDirectorySetupHandler.java | 7 ------- .../airavata/gfac/gsissh/handler/GSISSHInputHandler.java | 9 +-------- .../gfac/gsissh/handler/GSISSHOutputHandler.java | 11 +---------- .../gfac/gsissh/provider/impl/GSISSHProvider.java | 10 +--------- .../gfac/ssh/handler/SSHDirectorySetupHandler.java | 10 +--------- .../airavata/gfac/ssh/handler/SSHInputHandler.java | 7 ------- .../airavata/gfac/ssh/handler/SSHOutputHandler.java | 8 -------- .../airavata/gfac/ssh/provider/impl/SSHProvider.java | 7 ------- 8 files changed, 4 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/71de39d9/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java index 89c30db..b87f99a 100644 --- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java +++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java @@ -92,13 +92,6 @@ public class GSISSHDirectorySetupHandler extends AbstractRecoverableHandler { registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskID()); } catch (Exception e) { - if (cluster != null) { - try { - cluster.disconnect(); - } catch (SSHApiException e1) { - throw new GFacHandlerException(e1.getMessage(), e1); - } - } DataTransferDetails detail = new DataTransferDetails(); TransferStatus status = new TransferStatus(); detail.setTransferDescription(e.getLocalizedMessage()); http://git-wip-us.apache.org/repos/asf/airavata/blob/71de39d9/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 2d9182f..5665b5b 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 @@ -155,14 +155,7 @@ public class GSISSHInputHandler extends AbstractRecoverableHandler { inputNew.getParameters().put(paramName, actualParameter); } } catch (Exception e) { - if (cluster != null) { - try { - cluster.disconnect(); - } catch (SSHApiException e1) { - throw new GFacHandlerException(e1.getMessage(), e1); - } - } - log.error(e.getMessage()); + log.error(e.getMessage()); status.setTransferState(TransferState.FAILED); detail.setTransferDescription(e.getLocalizedMessage()); detail.setTransferStatus(status); http://git-wip-us.apache.org/repos/asf/airavata/blob/71de39d9/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java index c90bc1d..dd2e5e6 100644 --- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java +++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java @@ -296,17 +296,8 @@ public class GSISSHOutputHandler extends AbstractRecoverableHandler { throw new GFacHandlerException("Error persisting status", e1, e1.getLocalizedMessage()); } throw new GFacHandlerException("Error in retrieving results", e); - }finally { - if (cluster != null) { - try { - cluster.disconnect(); - } catch (SSHApiException e) { - throw new GFacHandlerException(e.getMessage(), e); - } - } } - - } + } public void initProperties(Properties properties) throws GFacHandlerException { http://git-wip-us.apache.org/repos/asf/airavata/blob/71de39d9/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/provider/impl/GSISSHProvider.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/provider/impl/GSISSHProvider.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/provider/impl/GSISSHProvider.java index e708f52..97f775f 100644 --- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/provider/impl/GSISSHProvider.java +++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/provider/impl/GSISSHProvider.java @@ -116,15 +116,7 @@ public class GSISSHProvider extends AbstractRecoverableProvider { delegateToMonitorHandlers(jobExecutionContext, (GsisshHostType) host, jobID); // we know this host is type GsiSSHHostType } catch (Exception e) { - if (cluster != null) { - try { - cluster.disconnect(); - } catch (SSHApiException e1) { - throw new GFacProviderException(e1.getMessage(), e1); - } - } - - String error = "Error submitting the job to host " + host.getHostAddress() + " message: " + e.getMessage(); + String error = "Error submitting the job to host " + host.getHostAddress() + " message: " + e.getMessage(); log.error(error); jobDetails.setJobID("none"); GFacUtils.saveJobStatus(jobExecutionContext, jobDetails, JobState.FAILED); http://git-wip-us.apache.org/repos/asf/airavata/blob/71de39d9/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java index d88911c..0be6820 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java @@ -87,15 +87,7 @@ public class SSHDirectorySetupHandler extends AbstractHandler { registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskID()); } catch (Exception e) { - if (cluster != null) { - try { - cluster.disconnect(); - } catch (SSHApiException e1) { - throw new GFacHandlerException(e1.getMessage(), e1); - } - } - - DataTransferDetails detail = new DataTransferDetails(); + DataTransferDetails detail = new DataTransferDetails(); TransferStatus status = new TransferStatus(); status.setTransferState(TransferState.FAILED); detail.setTransferStatus(status); http://git-wip-us.apache.org/repos/asf/airavata/blob/71de39d9/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 f1fcddd..b26e035 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 @@ -135,13 +135,6 @@ public class SSHInputHandler extends AbstractHandler { inputNew.getParameters().put(paramName, actualParameter); } } catch (Exception e) { - if (cluster != null) { - try { - cluster.disconnect(); - } catch (SSHApiException e1) { - throw new GFacHandlerException(e1.getMessage(), e1); - } - } log.error(e.getMessage()); status.setTransferState(TransferState.FAILED); detail.setTransferStatus(status); http://git-wip-us.apache.org/repos/asf/airavata/blob/71de39d9/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java index 83e8599..dbbb388 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java @@ -243,14 +243,6 @@ public class SSHOutputHandler extends AbstractHandler { throw new GFacHandlerException("Error persisting status", e1, e1.getLocalizedMessage()); } throw new GFacHandlerException("Error in retrieving results", e); - }finally { - if (cluster != null) { - try { - cluster.disconnect(); - } catch (SSHApiException e) { - throw new GFacHandlerException(e.getMessage(), e); - } - } } } http://git-wip-us.apache.org/repos/asf/airavata/blob/71de39d9/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 60d9582..0527c78 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 @@ -134,13 +134,6 @@ public class SSHProvider extends AbstractProvider { // GFacUtils.updateJobStatus(details, JobState.COMPLETE); } catch (Exception e) { - if (cluster != null) { - try { - cluster.disconnect(); - } catch (SSHApiException e1) { - throw new GFacProviderException(e1.getMessage(), e1); - } - } throw new GFacProviderException(e.getMessage(), e); } } else {
