Return-Path: X-Original-To: apmail-tez-commits-archive@minotaur.apache.org Delivered-To: apmail-tez-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D1E1C17992 for ; Fri, 17 Oct 2014 19:25:07 +0000 (UTC) Received: (qmail 50344 invoked by uid 500); 17 Oct 2014 19:25:07 -0000 Delivered-To: apmail-tez-commits-archive@tez.apache.org Received: (qmail 50309 invoked by uid 500); 17 Oct 2014 19:25:07 -0000 Mailing-List: contact commits-help@tez.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.apache.org Delivered-To: mailing list commits@tez.apache.org Received: (qmail 50300 invoked by uid 99); 17 Oct 2014 19:25:07 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Oct 2014 19:25:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 817DF99A8FC; Fri, 17 Oct 2014 19:25:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hitesh@apache.org To: commits@tez.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: TEZ-1669. yarn-swimlanes.sh throws error post TEZ-1556. (Rajesh Balamohan via hitesh) Date: Fri, 17 Oct 2014 19:25:07 +0000 (UTC) Repository: tez Updated Branches: refs/heads/branch-0.5 c414b3f37 -> a1c2fa95e TEZ-1669. yarn-swimlanes.sh throws error post TEZ-1556. (Rajesh Balamohan via hitesh) (cherry picked from commit 9577195f6897d5eb24cf19361a23ca911f7a48cd) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/a1c2fa95 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/a1c2fa95 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/a1c2fa95 Branch: refs/heads/branch-0.5 Commit: a1c2fa95e8b93c128dfa04e608c1917c83a5f6ad Parents: c414b3f Author: Hitesh Shah Authored: Fri Oct 17 12:24:14 2014 -0700 Committer: Hitesh Shah Committed: Fri Oct 17 12:24:57 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + tez-tools/swimlanes/amlogparser.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/a1c2fa95/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index fb8fa0c..68efb81 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -32,6 +32,7 @@ ALL CHANGES: and counter update interval. TEZ-1462. Remove unnecessary SuppressWarnings. TEZ-1633. Fixed expected values in TestTaskRecovery.testRecovery_OneTAStarted. + TEZ-1669. yarn-swimlanes.sh throws error post TEZ-1556. Release 0.5.1: 2014-10-02 http://git-wip-us.apache.org/repos/asf/tez/blob/a1c2fa95/tez-tools/swimlanes/amlogparser.py ---------------------------------------------------------------------- diff --git a/tez-tools/swimlanes/amlogparser.py b/tez-tools/swimlanes/amlogparser.py index e336d52..02f4892 100644 --- a/tez-tools/swimlanes/amlogparser.py +++ b/tez-tools/swimlanes/amlogparser.py @@ -174,7 +174,7 @@ class AMLog(object): def init(self): ID=r'[^\]]*' TS=r'[0-9:\-, ]*' - MAIN_RE=r'^(?P%(ts)s) INFO [(?P%(id)s)] org.apache.tez.dag.history.HistoryEventHandler: [HISTORY][DAG:(?P%(id)s)][Event:(?P%(id)s)]: (?P.*)' + MAIN_RE=r'^(?P%(ts)s) INFO [(?P%(id)s)] (org.apache.tez.dag.)?history.HistoryEventHandler: [HISTORY][DAG:(?P%(id)s)][Event:(?P%(id)s)]: (?P.*)' MAIN_RE = MAIN_RE.replace('[','\[').replace(']','\]') MAIN_RE = MAIN_RE % {'ts' : TS, 'id' : ID} self.MAIN_RE = re.compile(MAIN_RE)