diff --git llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/QueryTracker.java llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/QueryTracker.java index 0d5713a5f9..eae8e08540 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/QueryTracker.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/QueryTracker.java @@ -437,7 +437,12 @@ public void serviceStart() { @Override public void serviceStop() { - executorService.shutdownNow(); + executorService.shutdown(); + try { + executorService.awaitTermination(10000, TimeUnit.MILLISECONDS); + } catch (InterruptedException e) { + LOG.warn("cannot finish QueryTracker cleanup because of InterruptedException", e); + } LOG.info(getName() + " stopped"); }