Repository: airavata Updated Branches: refs/heads/master d6e8b19d4 -> 5ea8f2c0b
Changes to push error. AIRAVATA-1452 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5ea8f2c0 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5ea8f2c0 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5ea8f2c0 Branch: refs/heads/master Commit: 5ea8f2c0b94f3eaf200436ed5d658af6e964e18b Parents: d6e8b19 Author: raminder <[email protected]> Authored: Wed Sep 24 12:38:02 2014 -0400 Committer: raminder <[email protected]> Committed: Wed Sep 24 12:38:02 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java | 3 +-- .../airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java | 2 +- .../airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/5ea8f2c0/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 beaa124..6e2326f 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 @@ -970,8 +970,7 @@ public class BetterGfacImpl implements GFac,Watcher { handler.invoke(jobExecutionContext); GFacUtils.updatePluginState(zk, jobExecutionContext, handlerClassName.getClassName(), GfacPluginState.COMPLETED); } catch (Exception e) { - // TODO: Better error reporting. - throw new GFacException("Error Executing a OutFlow Handler", e); + throw new GFacException(e); } }else{ log.info("Experiment execution is cancelled, so OutHandler invocation is going to stop"); http://git-wip-us.apache.org/repos/asf/airavata/blob/5ea8f2c0/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java index 58b48ef..3e9992a 100644 --- a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java +++ b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java @@ -60,7 +60,7 @@ import java.util.concurrent.LinkedBlockingQueue; */ public class HPCPullMonitor extends PullMonitor { private final static Logger logger = LoggerFactory.getLogger(HPCPullMonitor.class); - public static final int FAILED_COUNT = 100000; + public static final int FAILED_COUNT = 3; // I think this should use DelayedBlocking Queue to do the monitoring*/ private BlockingQueue<UserMonitorData> queue; http://git-wip-us.apache.org/repos/asf/airavata/blob/5ea8f2c0/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java index e49ae30..428a08c 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java @@ -146,7 +146,7 @@ public class AdvancedSCPOutputHandler extends AbstractHandler { ActualParameter actualParameter = (ActualParameter) output.get(paramName); if ("URI".equals(actualParameter.getType().getType().toString())) { String downloadFile = MappingFactory.toString(actualParameter); - if(downloadFile == null){ + if(downloadFile == null || !(new File(downloadFile).isFile())){ throw new GFacHandlerException("Empty Output returned from the application"); } pbsCluster.scpTo(outputPath, downloadFile);
