This is an automated email from the ASF dual-hosted git repository. mapohl pushed a commit to branch release-1.14 in repository https://gitbox.apache.org/repos/asf/flink.git
commit 1c492ed97fe2876041804b944c6cb370430b3519 Author: Chesnay Schepler <ches...@apache.org> AuthorDate: Mon Apr 11 17:33:51 2022 +0200 [hotfix][tests] Allow retrieval of termination future for running jobs --- .../java/org/apache/flink/runtime/dispatcher/Dispatcher.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/Dispatcher.java b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/Dispatcher.java index 121990e2199..c09ba52ca9f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/Dispatcher.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/Dispatcher.java @@ -18,6 +18,7 @@ package org.apache.flink.runtime.dispatcher; +import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.JobStatus; import org.apache.flink.api.common.operators.ResourceSpec; @@ -996,15 +997,10 @@ public abstract class Dispatcher extends PermanentlyFencedRpcEndpoint<Dispatcher getMainThreadExecutor()); } + @VisibleForTesting CompletableFuture<Void> getJobTerminationFuture(JobID jobId) { - if (runningJobs.containsKey(jobId)) { - return FutureUtils.completedExceptionally( - new DispatcherException( - String.format("Job with job id %s is still running.", jobId))); - } else { - return jobManagerRunnerTerminationFutures.getOrDefault( - jobId, CompletableFuture.completedFuture(null)); - } + return jobManagerRunnerTerminationFutures.getOrDefault( + jobId, CompletableFuture.completedFuture(null)); } private void registerDispatcherMetrics(MetricGroup jobManagerMetricGroup) {