tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jh...@apache.org
Subject tajo git commit: TAJO-1522: NPE making stage history before task scheduler is initialized.
Date Mon, 20 Apr 2015 01:36:42 GMT
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 <jhkim@apache.org>


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 <navis@apache.org>
Authored: Mon Apr 20 10:34:25 2015 +0900
Committer: Jinho Kim <jhkim@apache.org>
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<StageEvent> {
     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;


Mime
View raw message