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/29 17:04:33 UTC
git commit: Coonection is closed in output handler. AIRAVATA-1456
Repository: airavata
Updated Branches:
refs/heads/master 1090843d7 -> 94f5bcb7f
Coonection is closed in output handler. AIRAVATA-1456
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/94f5bcb7
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/94f5bcb7
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/94f5bcb7
Branch: refs/heads/master
Commit: 94f5bcb7f3ec6145f665b220db0f04665feb52b0
Parents: 1090843
Author: raminder <ra...@apache.org>
Authored: Mon Sep 29 11:03:31 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Mon Sep 29 11:03:31 2014 -0400
----------------------------------------------------------------------
.../handler/GSISSHDirectorySetupHandler.java | 43 ++++++++++----------
.../gfac/gsissh/handler/GSISSHInputHandler.java | 15 ++++---
.../gsissh/provider/impl/GSISSHProvider.java | 15 +++----
.../ssh/handler/SSHDirectorySetupHandler.java | 16 ++++----
.../gfac/ssh/handler/SSHInputHandler.java | 15 ++++---
.../gfac/ssh/provider/impl/SSHProvider.java | 17 ++++----
6 files changed, 59 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/94f5bcb7/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 b7d9d67..89c30db 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
@@ -91,28 +91,27 @@ public class GSISSHDirectorySetupHandler extends AbstractRecoverableHandler {
registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskID());
- } catch (Exception e) {
- DataTransferDetails detail = new DataTransferDetails();
- TransferStatus status = new TransferStatus();
- detail.setTransferDescription(e.getLocalizedMessage());
- status.setTransferState(TransferState.FAILED);
- detail.setTransferStatus(status);
- try {
- registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskID());
- GFacUtils.saveErrorDetails(jobExecutionContext, e.getLocalizedMessage(), CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.FILE_SYSTEM_FAILURE);
- } catch (Exception e1) {
- throw new GFacHandlerException("Error persisting status", e1, e1.getLocalizedMessage());
- }
- throw new GFacHandlerException("Error executing the Handler: " + GSISSHDirectorySetupHandler.class, e);
- }finally {
- if (cluster != null) {
- try {
- cluster.disconnect();
- } catch (SSHApiException e) {
- throw new GFacHandlerException(e.getMessage(), e);
- }
- }
- }
+ } 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());
+ status.setTransferState(TransferState.FAILED);
+ detail.setTransferStatus(status);
+ try {
+ registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskID());
+ GFacUtils.saveErrorDetails(jobExecutionContext, e.getLocalizedMessage(), CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.FILE_SYSTEM_FAILURE);
+ } catch (Exception e1) {
+ throw new GFacHandlerException("Error persisting status", e1, e1.getLocalizedMessage());
+ }
+ throw new GFacHandlerException("Error executing the Handler: " + GSISSHDirectorySetupHandler.class, e);
+ }
}
public void recover(JobExecutionContext jobExecutionContext) throws GFacHandlerException {
http://git-wip-us.apache.org/repos/asf/airavata/blob/94f5bcb7/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 2f0bb70..2d9182f 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,6 +155,13 @@ 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());
status.setTransferState(TransferState.FAILED);
detail.setTransferDescription(e.getLocalizedMessage());
@@ -166,14 +173,6 @@ public class GSISSHInputHandler extends AbstractRecoverableHandler {
throw new GFacHandlerException("Error persisting status", e1, e1.getLocalizedMessage());
}
throw new GFacHandlerException("Error while input File Staging", e, e.getLocalizedMessage());
- }finally {
- if (cluster != null) {
- try {
- cluster.disconnect();
- } catch (SSHApiException e) {
- throw new GFacHandlerException(e.getMessage(), e);
- }
- }
}
jobExecutionContext.setInMessageContext(inputNew);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/94f5bcb7/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 9c6a94e..e708f52 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,6 +116,14 @@ 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();
log.error(error);
jobDetails.setJobID("none");
@@ -126,13 +134,6 @@ public class GSISSHProvider extends AbstractRecoverableProvider {
log.info("Saving data for future recovery: ");
log.info(data.toString());
GFacUtils.savePluginData(jobExecutionContext, data, this.getClass().getName());
- if (cluster != null) {
- try {
- cluster.disconnect();
- } catch (SSHApiException e) {
- throw new GFacProviderException(e.getMessage(), e);
- }
- }
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/94f5bcb7/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 05458e4..d88911c 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,6 +87,14 @@ 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();
TransferStatus status = new TransferStatus();
status.setTransferState(TransferState.FAILED);
@@ -98,14 +106,6 @@ public class SSHDirectorySetupHandler extends AbstractHandler {
throw new GFacHandlerException("Error persisting status", e1, e1.getLocalizedMessage());
}
throw new GFacHandlerException("Error executing the Handler: " + SSHDirectorySetupHandler.class, 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/94f5bcb7/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 e87bdd4..f1fcddd 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,6 +135,13 @@ 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);
@@ -145,14 +152,6 @@ public class SSHInputHandler extends AbstractHandler {
throw new GFacHandlerException("Error persisting status", e1, e1.getLocalizedMessage());
}
throw new GFacHandlerException("Error while input File Staging", e, e.getLocalizedMessage());
- }finally {
- if (cluster != null) {
- try {
- cluster.disconnect();
- } catch (SSHApiException e) {
- throw new GFacHandlerException(e.getMessage(), e);
- }
- }
}
jobExecutionContext.setInMessageContext(inputNew);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/94f5bcb7/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 c059676..60d9582 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,16 +134,15 @@ 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);
- } finally {
- if (cluster != null) {
- try {
- cluster.disconnect();
- } catch (SSHApiException e) {
- throw new GFacProviderException(e.getMessage(), e);
- }
- }
- }
+ }
} else {
try {
jobExecutionContext.getNotifier().publish(new StartExecutionEvent());