[GitHub] [flink] kisimple commented on a change in pull request #7757: [FLINK-11630] Triggers the termination of all running Tasks when shutting down TaskExecutor

[GitBox <gi...@apache.org>]

kisimple 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_r297126501
 
 

 ##########
 File path: flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java
 ##########
 @@ -347,18 +352,39 @@ private void handleStartTaskExecutorServicesException(Exception e) throws Except
 
 		resourceManagerHeartbeatManager.stop();
 
-		try {
-			stopTaskExecutorServices();
-		} catch (Exception e) {
-			throwable = ExceptionUtils.firstOrSuppressed(e, throwable);
-		}
+		List<CompletableFuture<Void>> taskCompletionFutures = failSubmittedTasks();
 
 		if (throwable != null) {
+			try {
+				stopTaskExecutorServices();
+			} catch (Exception e) {
+				throwable = ExceptionUtils.firstOrSuppressed(e, throwable);
+			}
 			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 {
+					stopTaskExecutorServices();
+				} catch (Exception e) {
+					throw new FlinkRuntimeException("Error while shutting the TaskExecutor down.", e);
+				}
+				log.info("Stopped TaskExecutor {}.", getAddress());
+			});
 
 Review comment:
   I'm afraid that the `throwable` can't be used in the callback because it is not a `final` var.

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services