fix(ndb): avoid unbound lock in delete callback - #17969
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Code Review
This pull request updates the delete function in _datastore_api.py to handle cases where a global cache lock is not acquired, particularly when a transaction is active but the datastore is not used. It also adds a corresponding unit test to verify this behavior. The review feedback suggests making the lock check more explicit by using if lock is not None: instead of if lock: to prevent potential issues with falsy values.
Contributor
|
Hi @lyushher, Thanks for opening a PR! Please could you resolve the minor coverage gap? |
parthea
approved these changes
Aug 14, 2026
parthea
enabled auto-merge (squash)
August 14, 2026 15:28
daniel-sanche
approved these changes
Aug 14, 2026
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
This PR fixes a
NameErrorthat occurs whenndb.delete()is called withuse_datastore=Falseinside a transaction while the global cache is enabled.The transaction completion callback can reference
lockeven though no lock is acquired when datastore writes are disabled.Changes
Testing
All 78 tests passed.
Fixes #17926