diff --git llap-server/src/java/org/apache/hadoop/hive/llap/shufflehandler/ShuffleHandler.java llap-server/src/java/org/apache/hadoop/hive/llap/shufflehandler/ShuffleHandler.java index 2572c75..741c7f2 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/shufflehandler/ShuffleHandler.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/shufflehandler/ShuffleHandler.java @@ -350,7 +350,8 @@ public static void shutdown() throws Exception { } public static ShuffleHandler get() { - Preconditions.checkState(started.get(), "ShuffleHandler must be started before invoking started"); + Preconditions.checkState(started.get(), + "ShuffleHandler must be started before invoking get"); return INSTANCE; } @@ -434,7 +435,9 @@ public void registerDag(String applicationIdString, int dagIdentifier, } public void unregisterDag(String dir, String applicationIdString, int dagIdentifier) { - dirWatcher.unregisterDagDir(dir, applicationIdString, dagIdentifier); + if (dirWatcher != null) { + dirWatcher.unregisterDagDir(dir, applicationIdString, dagIdentifier); + } // TODO Cleanup registered tokens and dag info }