You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2015/03/31 16:22:57 UTC
[1/2] airavata git commit: fixing AIRAVATA-1567
Repository: airavata
Updated Branches:
refs/heads/master aff5d9288 -> d89236975
fixing AIRAVATA-1567
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d798cab5
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d798cab5
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d798cab5
Branch: refs/heads/master
Commit: d798cab5209a093d1f08eac591626d10ace13e14
Parents: a8cf35f
Author: Lahiru Gunathilake <gl...@gmail.com>
Authored: Tue Mar 31 10:22:40 2015 -0400
Committer: Lahiru Gunathilake <gl...@gmail.com>
Committed: Tue Mar 31 10:22:40 2015 -0400
----------------------------------------------------------------------
.../airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d798cab5/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 f0b447e..ab934ca 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
@@ -195,6 +195,8 @@ public class HPCPullMonitor extends PullMonitor {
logger.info("Job cancelled: marking the Job as ************CANCELLED************ experiment {}, task {}, job name {} .",
iMonitorID.getExperimentID(), iMonitorID.getTaskID(), iMonitorID.getJobName());
sendNotification(iMonitorID);
+ logger.info("To avoid timing issues we sleep sometime and try to retrieve output files");
+ Thread.sleep(10000);
GFacThreadPoolExecutor.getFixedThreadPool().submit(new OutHandlerWorker(gfac, iMonitorID, publisher));
break;
}
[2/2] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by la...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d8923697
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d8923697
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d8923697
Branch: refs/heads/master
Commit: d89236975ad8e48bed81acccf545a4f2fb301845
Parents: d798cab aff5d92
Author: Lahiru Gunathilake <gl...@gmail.com>
Authored: Tue Mar 31 10:22:50 2015 -0400
Committer: Lahiru Gunathilake <gl...@gmail.com>
Committed: Tue Mar 31 10:22:50 2015 -0400
----------------------------------------------------------------------
.../client/samples/CreateLaunchBES.java | 487 +++++++++++++++++++
.../client/samples/RegisterSampleData.java | 9 +
.../tools/RegisterSampleApplications.java | 38 +-
.../tools/RegisterSampleApplicationsUtils.java | 3 +-
.../appcatalog/cpi/WorkflowCatalog.java | 4 +
.../catalog/data/impl/WorkflowCatalogImpl.java | 21 +
.../data/resources/WorkflowOutputResource.java | 4 +-
.../server/src/main/resources/PBSTemplate.xslt | 2 +-
.../gfac/bes/utils/ApplicationProcessor.java | 58 ++-
.../airavata/gfac/bes/utils/BESConstants.java | 4 +
.../gfac/bes/utils/DataTransferrer.java | 7 +-
.../gfac/bes/utils/ResourceProcessor.java | 8 +-
.../gfac/bes/utils/UASDataStagingProcessor.java | 5 +-
.../airavata/gfac/ssh/util/GFACSSHUtils.java | 3 +-
.../airavata-orchestrator-service/pom.xml | 2 +-
.../test-suite/multi-tenanted-airavata/pom.xml | 10 +
.../multitenantedairavata/AiravataClient.java | 6 +-
.../ApplicationRegister.java | 326 +++++++++++++
.../ComputeResourceRegister.java | 226 +++++++++
.../testsuite/multitenantedairavata/Setup.java | 178 ++++++-
.../utils/PropertyReader.java | 2 +-
.../utils/TestFrameworkConstants.java | 36 ++
.../main/resources/airavata-client.properties | 11 +
.../main/resources/test-framework.properties | 9 +-
modules/workflow/workflow-core/pom.xml | 3 +-
.../core/SimpleWorkflowInterpreter.java | 18 +
.../core/parser/AiravataWorkflowParser.java | 1 +
.../ui/dialogs/registry/RegistryWindow.java | 2 +-
.../WorkflowInterpreterLaunchWindow.java | 105 ++--
29 files changed, 1508 insertions(+), 80 deletions(-)
----------------------------------------------------------------------