tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hit...@apache.org
Subject git commit: TEZ-1669. yarn-swimlanes.sh throws error post TEZ-1556. (Rajesh Balamohan via hitesh)
Date Fri, 17 Oct 2014 19:24:42 GMT
Repository: tez
Updated Branches:
  refs/heads/master b37ce2cd8 -> 9577195f6


TEZ-1669. yarn-swimlanes.sh throws error post TEZ-1556. (Rajesh Balamohan via hitesh)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/9577195f
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/9577195f
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/9577195f

Branch: refs/heads/master
Commit: 9577195f6897d5eb24cf19361a23ca911f7a48cd
Parents: b37ce2c
Author: Hitesh Shah <hitesh@apache.org>
Authored: Fri Oct 17 12:24:14 2014 -0700
Committer: Hitesh Shah <hitesh@apache.org>
Committed: Fri Oct 17 12:24:14 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/9577195f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2cc1867..8f97867 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -39,6 +39,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/9577195f/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>%(ts)s) INFO [(?P<thread>%(id)s)] org.apache.tez.dag.history.HistoryEventHandler:
[HISTORY][DAG:(?P<dag>%(id)s)][Event:(?P<event>%(id)s)]: (?P<args>.*)'
+		MAIN_RE=r'^(?P<ts>%(ts)s) INFO [(?P<thread>%(id)s)] (org.apache.tez.dag.)?history.HistoryEventHandler:
[HISTORY][DAG:(?P<dag>%(id)s)][Event:(?P<event>%(id)s)]: (?P<args>.*)'
 		MAIN_RE = MAIN_RE.replace('[','\[').replace(']','\]')
 		MAIN_RE = MAIN_RE % {'ts' : TS, 'id' : ID}
 		self.MAIN_RE = re.compile(MAIN_RE)


Mime
View raw message