This repository was archived by the owner on Apr 1, 2026. It is now read-only.
fix: add lock to flow control - #899
Merged
daniel-sanche merged 3 commits intoDec 12, 2023
Merged
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
Copy link
Copy Markdown
|
🤖 I detect that the PR title and the commit message differ and there's only one commit. To use the PR title for the commit history, you can use Github's automerge feature with squashing, or use automerge label. Good luck human! -- conventional-commit-lint bot |
Sorry, something went wrong.
daniel-sanche
commented
Dec 12, 2023
Comment thread
google/cloud/bigtable/batcher.py
| with self._lock: | ||
| self.inflight_mutations += batch_info.mutations_count | ||
| self.inflight_size += batch_info.mutations_size | ||
| self.set_flow_control_status() |
Copy link
Copy Markdown
Contributor
Author
There was a problem hiding this comment.
I believe we can keep set_flow_control_status out of the lock. Even if it occasionally gets clobbered by later changes, every add and release ends with another call to set_flow_control_status, so it should be eventually correct.
Sorry, something went wrong.
igorbernstein2
approved these changes
Dec 12, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Reviewers
1 more reviewer2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The MutationBatcher's _FlowControl class currently can experience a race condition, where the release of resources can be clobbered by a different thread adding resources to the flow. This can result in deadlock, where the flow is empty, but remains blocked waiting on mutations that are already complete
This PR adds a mutex lock, ensuring that only one thread has access to the flow control state at a time.