Skip to content

SAMZA-2293: Propagate the watermark future to StreamOperatorTask correctly #1129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mynameborat wants to merge 1 commit into from
Closed

SAMZA-2293: Propagate the watermark future to StreamOperatorTask correctly #1129

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions samza-core/src/main/java/org/apache/samza/operators/impl/OperatorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,16 +191,14 @@ public final CompletionStage<Void> onMessageAsync(M message, MessageCollector co
.toArray(CompletableFuture[]::new));
});

result.thenAccept(x -> {
return result.thenAccept(x -> {
WatermarkFunction watermarkFn = getOperatorSpec().getWatermarkFn();
if (watermarkFn != null) {
// check whether there is new watermark emitted from the user function
Long outputWm = watermarkFn.getOutputWatermark();
propagateWatermark(outputWm, collector, coordinator);
}
});

return result;
}

/**
Expand Down Expand Up @@ -415,7 +413,7 @@ private CompletionStage<Void> onWatermark(long watermark, MessageCollector colle
.toArray(CompletableFuture[]::new));
}

watermarkFuture.thenCompose(res -> propagateWatermark(outputWm, collector, coordinator));
watermarkFuture = watermarkFuture.thenCompose(res -> propagateWatermark(outputWm, collector, coordinator));
}

return watermarkFuture;
Expand Down