Repository: tez Updated Branches: refs/heads/master 9e47c635c -> cc0640013
TEZ-2898. tez tools : swimlanes.py is broken in master (rbalamohan) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/cc064001 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/cc064001 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/cc064001 Branch: refs/heads/master Commit: cc06400139f9a16d2f0b0c53b0a8589f6f3b2ad8 Parents: 9e47c63 Author: Rajesh Balamohan <[email protected]> Authored: Wed Jan 20 05:45:06 2016 +0530 Committer: Rajesh Balamohan <[email protected]> Committed: Wed Jan 20 05:45:06 2016 +0530 ---------------------------------------------------------------------- CHANGES.txt | 1 + tez-tools/swimlanes/amlogparser.py | 2 +- tez-tools/swimlanes/swimlane.py | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/cc064001/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 5226ea6..f1cc292 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -6,6 +6,7 @@ Release 0.8.3: Unreleased INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-2898. tez tools : swimlanes.py is broken. TEZ-2937. Can Processor.close() be called after closing inputs and outputs? TEZ-3037. History URL should be set regardless of which history logging service is enabled. TEZ-3032. DAG start time getting logged using system time instead of recorded time in startTime field. http://git-wip-us.apache.org/repos/asf/tez/blob/cc064001/tez-tools/swimlanes/amlogparser.py ---------------------------------------------------------------------- diff --git a/tez-tools/swimlanes/amlogparser.py b/tez-tools/swimlanes/amlogparser.py index 6e29bba..71db145 100644 --- a/tez-tools/swimlanes/amlogparser.py +++ b/tez-tools/swimlanes/amlogparser.py @@ -197,7 +197,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) http://git-wip-us.apache.org/repos/asf/tez/blob/cc064001/tez-tools/swimlanes/swimlane.py ---------------------------------------------------------------------- diff --git a/tez-tools/swimlanes/swimlane.py b/tez-tools/swimlanes/swimlane.py index dc8dc6f..bbd54df 100644 --- a/tez-tools/swimlanes/swimlane.py +++ b/tez-tools/swimlanes/swimlane.py @@ -179,7 +179,8 @@ def main(argv): x2 = marginRight+xdomain(c.finish) y2 = y1 + laneSize - 2 locality = (c.kvs.has_key("DATA_LOCAL_TASKS") * 1) + (c.kvs.has_key("RACK_LOCAL_TASKS")*2) - link = c.kvs["completedLogs"] + #CompletedLogs may not be present in latest tez logs + link = c.kvs.get("completedLogs", "") svg.rect(x1, y1, x2, y2, title=c.name, style="fill: %s; stroke: #ccc;" % (colour), link=link) if locality > 1: # rack-local (no-locality isn't counted) svg.rect(x1, y2-4, x2, y2, style="fill: #f00; fill-opacity: 0.5;", link=link)
