From commits-return-7072-apmail-airavata-commits-archive=airavata.apache.org@airavata.apache.org Thu Sep 18 22:15:59 2014 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 19EA511E1D for ; Thu, 18 Sep 2014 22:15:59 +0000 (UTC) Received: (qmail 95069 invoked by uid 500); 18 Sep 2014 22:15:59 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 95023 invoked by uid 500); 18 Sep 2014 22:15:59 -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 95013 invoked by uid 99); 18 Sep 2014 22:15:58 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Sep 2014 22:15:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BB10DA1BFAD; Thu, 18 Sep 2014 22:15:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lahiru@apache.org To: commits@airavata.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: modifying logs to get a better view of monitoring Date: Thu, 18 Sep 2014 22:15:58 +0000 (UTC) Repository: airavata Updated Branches: refs/heads/master 822bbe860 -> b8deb9e99 modifying logs to get a better view of monitoring Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b8deb9e9 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b8deb9e9 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b8deb9e9 Branch: refs/heads/master Commit: b8deb9e9919a1096b850e961e58f1fa42881a5d5 Parents: 822bbe8 Author: lahiru Authored: Thu Sep 18 18:15:53 2014 -0400 Committer: lahiru Committed: Thu Sep 18 18:15:53 2014 -0400 ---------------------------------------------------------------------- .../org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java | 4 ++++ .../org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java | 5 +++++ 2 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/b8deb9e9/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java index 1e9443a..8f1b51e 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java @@ -162,6 +162,7 @@ public class PBSOutputParser implements OutputParser { // int lastStop = 0; for (String jobID : statusMap.keySet()) { String jobName = jobID.split(",")[1]; + boolean found = false; for (int i = 0; i < info.length; i++) { if (info[i].contains(jobName.substring(0,8))) { // now starts processing this line @@ -176,9 +177,12 @@ public class PBSOutputParser implements OutputParser { } // lastStop = i + 1; statusMap.put(jobID, JobStatus.valueOf(columnList.get(9))); + found = true; break; } } + if(!found){ + log.error("Couldn't find the status of the Job with JobName: " + jobName + "Job Id: " + jobID.split(",")[0]); } } http://git-wip-us.apache.org/repos/asf/airavata/blob/b8deb9e9/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java index 5c96b06..c12441b 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java @@ -160,6 +160,7 @@ public class SlurmOutputParser implements OutputParser { for (String jobID : statusMap.keySet()) { String jobId = jobID.split(",")[0]; String jobName = jobID.split(",")[1]; + boolean found = false; for (int i = 0; i < info.length; i++) { if (info[i].contains(jobName.substring(0, 8))) { // now starts processing this line @@ -174,9 +175,13 @@ public class SlurmOutputParser implements OutputParser { } // lastStop = i + 1; statusMap.put(jobID, JobStatus.valueOf(columnList.get(4))); + found = true; break; } } + if (!found) { + log.error("Couldn't find the status of the Job with JobName: " + jobName + "Job Id: " + jobId); + } } } }