AIRAVATA-1511
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c36ab241 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c36ab241 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c36ab241 Branch: refs/heads/gfac_appcatalog_int Commit: c36ab24191a5e1d549a745c7456a056e889bd156 Parents: 65ad586 Author: Chathuri Wimalasena <[email protected]> Authored: Tue Nov 11 14:08:48 2014 -0500 Committer: Chathuri Wimalasena <[email protected]> Committed: Tue Nov 11 14:08:48 2014 -0500 ---------------------------------------------------------------------- .../apache/airavata/client/samples/CreateLaunchExperiment.java | 4 ++-- .../airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/c36ab241/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java index dbb4a0c..2d0f4fa 100644 --- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java +++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java @@ -58,7 +58,7 @@ public class CreateLaunchExperiment { private static final String DEFAULT_GATEWAY = "default.registry.gateway"; private static Airavata.Client airavataClient; - private static String echoAppId = "Echo_636b4530-6fb2-4c9e-998a-b41e648aa70f"; + private static String echoAppId = "Echo_7b3cfedd-efe4-4a6f-8201-9ee1891d8ced"; private static String wrfAppId = "WRF_d41bdc86-e280-4eb6-a045-708f69a8c116"; private static String amberAppId = "Amber_b23ee051-90d6-4892-827e-622a2f6c95ee"; @@ -75,7 +75,7 @@ public class CreateLaunchExperiment { public static void main(String[] args) throws Exception { airavataClient = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT); System.out.println("API version is " + airavataClient.getAPIVersion()); -// registerApplications(); // run this only the first time +// regist?erApplications(); // run this only the first time createAndLaunchExp(); } http://git-wip-us.apache.org/repos/asf/airavata/blob/c36ab241/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 171ca07..824ab71 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 @@ -250,8 +250,7 @@ public class HPCPullMonitor extends PullMonitor { MonitorID iMonitorID = iterator.next(); if (iMonitorID.getFailedCount() > FAILED_COUNT) { iMonitorID.setLastMonitored(new Timestamp((new Date()).getTime())); - String outputDir = iMonitorID.getJobExecutionContext().getApplicationContext() - .getApplicationDeploymentDescription().getType().getOutputDataDirectory(); + String outputDir = iMonitorID.getJobExecutionContext().getOutputDir(); List<String> stdOut = null; try { stdOut = connection.getCluster().listDirectory(outputDir); // check the outputs directory @@ -299,8 +298,7 @@ public class HPCPullMonitor extends PullMonitor { HostMonitorData iHostMonitorID = iterator1.next(); if (iHostMonitorID.getMonitorIDs().size() == 0) { iterator1.remove(); - logger.debug("Removed host {} from monitoring queue", iHostMonitorID.getHost() - .getType().getHostAddress()); + logger.debug("Removed host {} from monitoring queue", iHostMonitorID.getComputeResourceDescription().getHostName()); } } if(take.getHostMonitorData().size()!=0) {
