azagrebin commented on a change in pull request #7757: [FLINK-11630] Triggers the termination of all running Tasks when shutting down TaskExecutor URL: https://github.com/apache/flink/pull/7757#discussion_r283828478
########## File path: flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java ########## @@ -348,20 +353,42 @@ private void handleStartTaskExecutorServicesException(Exception e) throws Except resourceManagerHeartbeatManager.stop(); try { - stopTaskExecutorServices(); + stopServicesBeforeTasksCompletion(); } catch (Exception e) { throwable = ExceptionUtils.firstOrSuppressed(e, throwable); } if (throwable != null) { return FutureUtils.completedExceptionally(new FlinkException("Error while shutting the TaskExecutor down.", throwable)); } else { - log.info("Stopped TaskExecutor {}.", getAddress()); - return CompletableFuture.completedFuture(null); + return FutureUtils.waitForAll(taskCompletionFutures).thenRun(() -> { + try { + stopServicesAfterTasksCompletion(); + } catch (Exception e) { + throw new FlinkRuntimeException("Error while shutting the TaskExecutor down.", e); + } + log.info("Stopped TaskExecutor {}.", getAddress()); + }); } } - private void stopTaskExecutorServices() throws Exception { + private List<CompletableFuture<Void>> failTasks(JobManagerConnection jobManagerConnection, + Throwable cause) { + List<CompletableFuture<Void>> taskCompletionFutures = new ArrayList<>(); + Iterator<Task> tasks = taskSlotTable.getTasks(jobManagerConnection.getJobID()); Review comment: Why not to use foreach loop instead of Iterator with while loop: `for (Task task : taskSlotTable.getTasks(jobID))` (I would have jobID as `failTasks` argument)? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services