Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7CD9E184C9 for ; Sat, 18 Jul 2015 21:45:02 +0000 (UTC) Received: (qmail 25369 invoked by uid 500); 18 Jul 2015 21:45:02 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 25317 invoked by uid 500); 18 Jul 2015 21:45:02 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 25308 invoked by uid 99); 18 Jul 2015 21:45:02 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 18 Jul 2015 21:45:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 30FCAE0435; Sat, 18 Jul 2015 21:45:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shameera@apache.org To: commits@airavata.apache.org Message-Id: <25bfc704d6994a6fb7b2c7464e75e3e8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: airavata git commit: Only support email based monitoring, throw and exception otherwise Date: Sat, 18 Jul 2015 21:45:02 +0000 (UTC) Repository: airavata Updated Branches: refs/heads/airavata-0.15-release-branch 321f477ce -> df9d3a5c9 Only support email based monitoring, throw and exception otherwise Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/df9d3a5c Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/df9d3a5c Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/df9d3a5c Branch: refs/heads/airavata-0.15-release-branch Commit: df9d3a5c9f6a6104383c9932b1bff2a6eb3bc793 Parents: 321f477 Author: Shameera Rathnayaka Authored: Sat Jul 18 17:44:54 2015 -0400 Committer: Shameera Rathnayaka Committed: Sat Jul 18 17:44:54 2015 -0400 ---------------------------------------------------------------------- .../gfac/gsissh/provider/impl/GSISSHProvider.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/df9d3a5c/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/provider/impl/GSISSHProvider.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/provider/impl/GSISSHProvider.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/provider/impl/GSISSHProvider.java index 540eaac..19bd176 100644 --- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/provider/impl/GSISSHProvider.java +++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/provider/impl/GSISSHProvider.java @@ -55,6 +55,7 @@ import org.slf4j.LoggerFactory; import java.io.PrintWriter; import java.io.StringWriter; +import java.text.MessageFormat; import java.util.List; import java.util.Map; @@ -309,10 +310,15 @@ public class GSISSHProvider extends AbstractProvider { } return; } + } else { + throw new GFacException(MessageFormat.format("expId: {0} , jobId {1} :- Job monitor mode {2} is not yet " + + "implemented, please change compute resource monitor mode to {3}", jobExecutionContext.getExperimentID(), + jobExecutionContext.getJobDetails().getJobID(), sshJobSubmission.getMonitorMode().name(), + MonitorMode.JOB_EMAIL_NOTIFICATION_MONITOR.name())); } // if email monitor is not activeated or not configure we use pull or push monitor - List daemonHandlers = BetterGfacImpl.getDaemonHandlers(); + /*List daemonHandlers = BetterGfacImpl.getDaemonHandlers(); if (daemonHandlers == null) { daemonHandlers = BetterGfacImpl.getDaemonHandlers(); } @@ -346,6 +352,6 @@ public class GSISSHProvider extends AbstractProvider { log.error("No Daemon handler is configured in gfac-config.xml, either pull or push, so monitoring will not invoked" + ", execution is configured as asynchronous, so Outhandler will not be invoked"); - } + }*/ } }