zentol commented on a change in pull request #13319:
URL: https://github.com/apache/flink/pull/13319#discussion_r490102457
##########
File path:
flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/component/DispatcherResourceManagerComponent.java
##########
@@ -74,22 +79,46 @@
@Nonnull ResourceManager<?> resourceManager,
@Nonnull LeaderRetrievalService
dispatcherLeaderRetrievalService,
@Nonnull LeaderRetrievalService
resourceManagerRetrievalService,
- @Nonnull WebMonitorEndpoint<?> webMonitorEndpoint) {
+ @Nonnull WebMonitorEndpoint<?> webMonitorEndpoint,
+ @Nonnull FatalErrorHandler fatalErrorHandler,
+ @Nonnull CompletableFuture<DispatcherGateway>
dispatcherGatewayCompletableFuture) {
this.dispatcherRunner = dispatcherRunner;
this.resourceManager = resourceManager;
this.dispatcherLeaderRetrievalService =
dispatcherLeaderRetrievalService;
this.resourceManagerRetrievalService =
resourceManagerRetrievalService;
this.webMonitorEndpoint = webMonitorEndpoint;
+ this.fatalErrorHandler = fatalErrorHandler;
this.terminationFuture = new CompletableFuture<>();
this.shutDownFuture = new CompletableFuture<>();
registerShutDownFuture();
+ failOnPrematureTermination(dispatcherGatewayCompletableFuture);
}
private void registerShutDownFuture() {
FutureUtils.forward(dispatcherRunner.getShutDownFuture(),
shutDownFuture);
}
+ private void
failOnPrematureTermination(CompletableFuture<DispatcherGateway>
dispatcherGatewayCompletableFuture) {
+ dispatcherGatewayCompletableFuture.whenComplete((dispatcher,
throwable) -> {
+ if (dispatcher != null && dispatcher instanceof
Dispatcher) {
+ CompletableFuture.anyOf(((Dispatcher)
dispatcher).getTerminationFuture(), resourceManager.getTerminationFuture())
+ .whenComplete((ignored, t) -> {
Review comment:
I don't see how that relates to my comment. We will call the fatal error
handler either way; the issue is that if t == null no reason for the shutdown
will be logged-
----------------------------------------------------------------
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]
