Repository: airavata Updated Branches: refs/heads/master e1af2643b -> a40f49c90
fixing amber in br2 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a40f49c9 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a40f49c9 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a40f49c9 Branch: refs/heads/master Commit: a40f49c900580abd52bb7c760d5f31d39dd08125 Parents: e1af264 Author: Chathuri Wimalasena <[email protected]> Authored: Thu Nov 13 14:15:43 2014 -0500 Committer: Chathuri Wimalasena <[email protected]> Committed: Thu Nov 13 14:15:43 2014 -0500 ---------------------------------------------------------------------- .../airavata/gfac/core/cpi/BetterGfacImpl.java | 2 -- .../gfac/gsissh/handler/GSISSHInputHandler.java | 16 ++++++++-------- .../airavata/gfac/ssh/handler/SSHInputHandler.java | 7 +++++++ 3 files changed, 15 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/a40f49c9/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java index b06dbab..932384b 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java @@ -396,9 +396,7 @@ public class BetterGfacImpl implements GFac,Watcher { * Stdout and Stderr for Shell */ jobExecutionContext.setStandardOutput(workingDir + File.separator + applicationInterface.getApplicationName().replaceAll("\\s+", "") + ".stdout"); - System.out.println("*********************** standared output ************* " + jobExecutionContext.getStandardOutput()); jobExecutionContext.setStandardError(workingDir + File.separator + applicationInterface.getApplicationName().replaceAll("\\s+", "") + ".stderr"); - System.out.println("*********************** standared error ************* " + jobExecutionContext.getStandardError()); } private void populateDefaultComputeResourceConfiguration(JobExecutionContext jobExecutionContext, ApplicationInterfaceDescription applicationInterface, ComputeResourceDescription computeResource) { http://git-wip-us.apache.org/repos/asf/airavata/blob/a40f49c9/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 d74727a..5ba3bf4 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 @@ -67,7 +67,7 @@ public class GSISSHInputHandler extends AbstractRecoverableHandler { TransferStatus status = new TransferStatus(); StringBuffer data = new StringBuffer("|"); Cluster cluster = null; - + try { String hostAddress = jobExecutionContext.getHostName(); if (jobExecutionContext.getSecurityContext(hostAddress) == null) { @@ -80,8 +80,8 @@ public class GSISSHInputHandler extends AbstractRecoverableHandler { } else { log.info("Successfully retrieved the Security Context"); } - - String pluginData = GFacUtils.getPluginData(jobExecutionContext, this.getClass().getName()); + + String pluginData = GFacUtils.getPluginData(jobExecutionContext, this.getClass().getName()); if (pluginData != null) { try { oldIndex = Integer.parseInt(pluginData.split("\\|")[0].trim()); @@ -93,7 +93,7 @@ public class GSISSHInputHandler extends AbstractRecoverableHandler { oldFiles.clear(); } } catch (NumberFormatException e) { - log.error("Previously stored data " + pluginData +" is wrong so we continue the operations"); + log.error("Previously stored data " + pluginData + " is wrong so we continue the operations"); } } if (jobExecutionContext.getSecurityContext(hostAddress) == null) { @@ -102,10 +102,10 @@ public class GSISSHInputHandler extends AbstractRecoverableHandler { } catch (ApplicationSettingsException e) { log.error(e.getMessage()); try { - GFacUtils.saveErrorDetails(jobExecutionContext, e.getLocalizedMessage(), CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.AIRAVATA_INTERNAL_ERROR); + GFacUtils.saveErrorDetails(jobExecutionContext, e.getLocalizedMessage(), CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.AIRAVATA_INTERNAL_ERROR); } catch (GFacException e1) { - log.error(e1.getLocalizedMessage()); - } + log.error(e1.getLocalizedMessage()); + } throw new GFacHandlerException("Error while creating SSHSecurityContext", e, e.getLocalizedMessage()); } } @@ -159,7 +159,7 @@ public class GSISSHInputHandler extends AbstractRecoverableHandler { inputNew.getParameters().put(paramName, inputParamType); } } catch (Exception e) { - 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/a40f49c9/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 0aec7cc..66cafaf 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 @@ -82,6 +82,13 @@ public class SSHInputHandler extends AbstractHandler { throw new GFacHandlerException("Error while creating SSHSecurityContext", e, e.getLocalizedMessage()); } } + + cluster = ((SSHSecurityContext) jobExecutionContext.getSecurityContext(hostAddress)).getPbsCluster(); + if (cluster == null) { + throw new GFacException("Security context is not set properly"); + } else { + log.info("Successfully retrieved the Security Context"); + } log.info("Invoking SCPInputHandler"); super.invoke(jobExecutionContext);
