dawidwys commented on a change in pull request #16589:
URL: https://github.com/apache/flink/pull/16589#discussion_r679127235
##########
File path:
flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/SourceStreamTask.java
##########
@@ -281,25 +298,47 @@ protected void declineCheckpoint(long checkpointId) {
public void run() {
try {
mainOperator.run(lock, operatorChain);
- if (!wasStoppedExternally && !isCanceled() && !isFailing()) {
- synchronized (lock) {
- operatorChain.setIgnoreEndOfInput(false);
- }
- CompletableFuture<Void> endOfDataProcessed = new
CompletableFuture<>();
- mainMailboxExecutor.execute(
- () -> {
- endData();
- endOfDataProcessed.complete(null);
- },
- "SourceStreamTask finished processing data.");
-
- // wait until all operators are finished
- endOfDataProcessed.get();
- }
+ completeProcessing();
completionFuture.complete(null);
} catch (Throwable t) {
// Note, t can be also an InterruptedException
- completionFuture.completeExceptionally(t);
+ if (isCanceled()
+ && ExceptionUtils.findThrowable(t,
InterruptedException.class)
+ .isPresent()) {
+ completionFuture.completeExceptionally(new
CancelTaskException(t));
+ } else if (wasDrained
+ && ExceptionUtils.findThrowable(t,
InterruptedException.class)
+ .isPresent()) {
+ // if we are stopping the source thread for
stop-with-savepoint
+ // we may actually return from run with an
InterruptedException which
+ // should be ignored
+ try {
+ // clear the interrupted status for the thread
+ Thread.interrupted();
+ completeProcessing();
+ completionFuture.complete(null);
+ } catch (Throwable e) {
+ completionFuture.completeExceptionally(e);
+ }
Review comment:
Correct. I will add a comment there.
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
