Skip to content
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.

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

Change UnboundedSourceAsSdfWrapperFn to share the cache across instances. #33901

Merged
merged 6 commits into from
Feb 25, 2025

Conversation

scwhittle
Copy link
Contributor

Add a utility class to enable sharing across all deserialized instances of a DoFn and use it in UnboundedSourceAsSdfWrapperFn to cache Readers across dofn instances.

fixes #32968

Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests
Go tests

See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.

@scwhittle scwhittle requested a review from kennknowles February 6, 2025 14:48
@github-actions github-actions bot added the java label Feb 6, 2025
@scwhittle
Copy link
Contributor Author

R: @kennknowles

I don't really like the utility class name, let me know if you have some better idea. It seems like this could be a common use within DoFns. For example, @sjvanrossum made me think of this concern in his work on Kafka source in #32986

Copy link
Contributor

github-actions bot commented Feb 6, 2025

Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control. If you'd like to restart, comment assign set of reviewers

…es of a DoFn and use it in UnboundedSourceAsSdfWrapperFn to cache Readers across dofn instances
@scwhittle
Copy link
Contributor Author

assign set of reviewers

@scwhittle
Copy link
Contributor Author

@sjvanrossum I tried to abstract your caching in the KafkaSDF here since there would be similar concerns about a static cache for this dofn.

Copy link
Contributor

Assigning reviewers. If you would like to opt out of this review, comment assign to next reviewer:

R: @m-trieu for label java.

Available commands:

  • stop reviewer notifications - opt out of the automated review tooling
  • remind me after tests pass - tag the comment author after tests pass
  • waiting on author - shift the attention set back to the author (any comment or push by the author will return the attention set to the reviewers)

The PR bot will only process comments in the main thread (not review comments).

@sjvanrossum
Copy link
Contributor

sjvanrossum commented Feb 12, 2025

@sjvanrossum I tried to abstract your caching in the KafkaSDF here since there would be similar concerns about a static cache for this dofn.

That looks good to me, thanks for distilling it into a utility class! As to naming, this is essentially a Supplier with additional guarantees about the return value of #get().

Drawing inspiration from Guava's Suppliers #memoize(Supplier), #memoizeWithExpiration(Supplier, long, TimeUnit) and #ofInstance​(T) backed by MemoizingSupplier, ExpiringMemoizingSupplier and SupplierOfInstance respectively, I think MemoizingPerInstantiationSerializableSupplier conveys the intended application of this class.

@scwhittle
Copy link
Contributor Author

Run Java PreCommit

@scwhittle
Copy link
Contributor Author

Run Java_IOs_Direct PreCommit

@scwhittle
Copy link
Contributor Author

Run Java_Pulsar_IO_Direct PreCommit

@scwhittle scwhittle closed this Feb 18, 2025
@scwhittle scwhittle reopened this Feb 18, 2025
Copy link
Member

@kennknowles kennknowles left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only pitfall I can think of is if it was used out of context in a DoFn that was used twice without being instantiated separately at each site. But this deep under the hood I think that is a pretty far fetched concern.

* <p>Specifically the wrapped supplier will be called once and the result memoized per group consisting
* of an instance and all instances deserialized from its serialized state.
*
* <p>A particular use for this is within a DoFn class to maintain shared state across all instances
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fancy! It took me a minute to understand how this works.

Use executor to close as there were previous problems closing inline with dataflow reader cache.
@scwhittle
Copy link
Contributor Author

@kennknowles Could you take another look? I realized that we have to worry now about concurrent cache access (before the DoFn being single-use-at-a-time prevented that) and the get/invalidate as separate methods could be racy. So I looked at dataflow runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/ReaderCache.java and changed to use the concurrentmap directly as it does. While there I noticed that there were previously problems due to close blocking so I made this similarly async. http://issues.apache.org/jira/browse/BEAM-11401

Copy link
Member

@kennknowles kennknowles left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting. The race is still there, right? The async close could be racing with some other usage of it, no? But it won't block the current thread is the main thing.

closeExecutor.execute(
() -> {
try {
Preconditions.checkNotNull(removalNotification.getValue())
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this doesn't actually change anything, as it will just throw an NPE same as if you didn't use it. So prefer to use Beam SDK's own Preconditions which have checkArgumentNotNull (throws IllegalArgumentException) and checkStateNotNull (throws IllegalStateException)

Out of curiosity, I looked at the docs on RemovalNotification I believe if the value is null here that means it was already garbage collected. Since you aren't using weakValues this will never happen. But if you wanted this code to be agnostic to the cache configuration a bit, you could just check if it is null and return early.

@scwhittle
Copy link
Contributor Author

Interesting. The race is still there, right? The async close could be racing with some other usage of it, no? But it won't block the current thread is the main thing.

The race was more with the get from the cache and separate invalidate. Since there are simulataneous dofns both could get the same value where we want more of acquire/checkout semantics so that there is just one user. That was addressed using the atomic asMap().remove() instead of the separate get/invalidate methods.

It's true long closes could still be an issue but at least they aren't blocking unrelated processing threads.

@scwhittle
Copy link
Contributor Author

Run Java_IOs_Direct PreCommit

@scwhittle
Copy link
Contributor Author

Run Java PreCommit

@scwhittle scwhittle closed this Feb 25, 2025
@scwhittle scwhittle reopened this Feb 25, 2025
@scwhittle
Copy link
Contributor Author

Run Java_Pulsar_IO_Direct PreCommit

@scwhittle
Copy link
Contributor Author

Run Java_IOs_Direct PreCommit

@scwhittle
Copy link
Contributor Author

Run Java_Amazon-Web-Services2_IO_Direct PreCommit

@scwhittle
Copy link
Contributor Author

failures are unrelated

@scwhittle scwhittle merged commit 16f7bb6 into apache:master Feb 25, 2025
38 of 45 checks passed
@scwhittle scwhittle deleted the reader_cache branch February 25, 2025 12:19
@liferoad liferoad added this to the 2.64.0 Release milestone Mar 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: UnboundedSourceAsSDFWrapperFn caches readers per DoFn instance
4 participants