Return-Path: X-Original-To: apmail-tajo-commits-archive@minotaur.apache.org Delivered-To: apmail-tajo-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 67DC2172B6 for ; Mon, 20 Apr 2015 01:36:42 +0000 (UTC) Received: (qmail 70864 invoked by uid 500); 20 Apr 2015 01:36:42 -0000 Delivered-To: apmail-tajo-commits-archive@tajo.apache.org Received: (qmail 70830 invoked by uid 500); 20 Apr 2015 01:36:42 -0000 Mailing-List: contact commits-help@tajo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tajo.apache.org Delivered-To: mailing list commits@tajo.apache.org Received: (qmail 70821 invoked by uid 99); 20 Apr 2015 01:36:42 -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; Mon, 20 Apr 2015 01:36:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 182A2DFB00; Mon, 20 Apr 2015 01:36:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jhkim@apache.org To: commits@tajo.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: tajo git commit: TAJO-1522: NPE making stage history before task scheduler is initialized. Date: Mon, 20 Apr 2015 01:36:42 +0000 (UTC) Repository: tajo Updated Branches: refs/heads/branch-0.10.1 fbe24e89c -> 4a02456d3 TAJO-1522: NPE making stage history before task scheduler is initialized. Signed-off-by: Jinho Kim Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/4a02456d Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/4a02456d Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/4a02456d Branch: refs/heads/branch-0.10.1 Commit: 4a02456d3e93a3630931066af60d17a61e28638a Parents: fbe24e8 Author: navis.ryu Authored: Mon Apr 20 10:34:25 2015 +0900 Committer: Jinho Kim Committed: Mon Apr 20 10:34:25 2015 +0900 ---------------------------------------------------------------------- CHANGES | 3 +++ .../src/main/java/org/apache/tajo/querymaster/Stage.java | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/4a02456d/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index ad2f0d3..fd133d5 100644 --- a/CHANGES +++ b/CHANGES @@ -27,6 +27,9 @@ Release 0.10.1 - unreleased BUG FIXES + TAJO-1522: NPE making stage history before task scheduler is initialized. + (Contributed by navis, Committed by jinho) + TAJO-1560: HashShuffle report should be ignored when a succeed tasks are not included. (jinho) http://git-wip-us.apache.org/repos/asf/tajo/blob/4a02456d/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java b/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java index c344682..80ccc21 100644 --- a/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java +++ b/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java @@ -469,8 +469,12 @@ public class Stage implements EventHandler { stageHistory.setKilledObjectCount(killedObjectCount); stageHistory.setFailedObjectCount(failedObjectCount); stageHistory.setTotalScheduledObjectsCount(totalScheduledObjectsCount); - stageHistory.setHostLocalAssigned(getTaskScheduler().getHostLocalAssigned()); - stageHistory.setRackLocalAssigned(getTaskScheduler().getRackLocalAssigned()); + + AbstractTaskScheduler scheduler = getTaskScheduler(); + if (scheduler != null) { + stageHistory.setHostLocalAssigned(scheduler.getHostLocalAssigned()); + stageHistory.setRackLocalAssigned(scheduler.getRackLocalAssigned()); + } long totalInputBytes = 0; long totalReadBytes = 0;