Merge branch 'master' into orchestratorJobCountImprovment
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9eddff96 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9eddff96 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9eddff96 Branch: refs/heads/orchestratorJobThrottleFeature Commit: 9eddff96fdeeffa33b2702aebe6d1b1f55441cd1 Parents: 8bc7995 5996b5c Author: shamrath <[email protected]> Authored: Mon Sep 22 11:01:18 2014 -0400 Committer: shamrath <[email protected]> Committed: Mon Sep 22 11:01:18 2014 -0400 ---------------------------------------------------------------------- .../client/samples/CreateLaunchExperiment.java | 268 ++++++++++--------- .../airavata/gfac/core/cpi/BetterGfacImpl.java | 9 + .../core/monitor/GfacInternalStatusUpdator.java | 4 + .../airavata/gfac/core/monitor/MonitorID.java | 6 - .../gfac/core/utils/OutHandlerWorker.java | 60 +++++ .../handlers/GridPullMonitorHandler.java | 2 +- .../monitor/impl/pull/qstat/HPCPullMonitor.java | 38 ++- .../airavata/gfac/monitor/util/CommonUtils.java | 2 +- .../gsi/ssh/api/job/PBSOutputParser.java | 16 +- .../gsi/ssh/api/job/SlurmOutputParser.java | 46 ++-- 10 files changed, 264 insertions(+), 187 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/9eddff96/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPullMonitorHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/9eddff96/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/9eddff96/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/util/CommonUtils.java ----------------------------------------------------------------------
