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_r294386771
##########
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 think @tillrohrmann (correct me if not) meant `If throwable == null` then
still try `stopTaskExecutorServices`.
Then we should register this callback for the result future, something like:
```
...
})
.handle((v, t) -> {
...
stopTaskExecutorServices();
} catch (Exception e) {
stopFailure = new FlinkRuntimeException("Error while shutting the
TaskExecutor down.", e);
throwable = ExceptionUtils.firstOrSuppressed(stopFailure, throwable);
}
...
if (t != null) {
t = ExceptionUtils.firstOrSuppressed(t, throwable);
throw t;
} else if (throwable !=null) {
throw throwable;
}
});
```
instead of `if (throwable != null) {...} else ...` and `thenRun`
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services
