Wait for running queries issued during grace period to finish

trinodb · Feb 20, 2020 · 083df41 · 083df41
1 parent f7a012e
commit 083df41
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/presto-main/src/main/java/io/prestosql/server/GracefulShutdownHandler.java b/presto-main/src/main/java/io/prestosql/server/GracefulShutdownHandler.java
@@ -87,6 +87,10 @@ public synchronized void requestShutdown()
         //wait for a grace period to start the shutdown sequence
         shutdownHandler.schedule(() -> {
             List<TaskInfo> activeTasks = getActiveTasks();
+
+            // wait for grace period for shutting down state to be observed by the coordinator
+            sleepUninterruptibly(gracePeriod.toMillis(), MILLISECONDS);
+
             while (activeTasks.size() > 0) {
                 CountDownLatch countDownLatch = new CountDownLatch(activeTasks.size());
 
@@ -109,6 +113,9 @@ public synchronized void requestShutdown()
                 }
 
                 activeTasks = getActiveTasks();
+
+                // wait for another grace period for all task states to be observed by the coordinator
+                sleepUninterruptibly(gracePeriod.toMillis(), MILLISECONDS);
             }
 
             // wait for another grace period for all task states to be observed by the coordinator