Lock around strong cache updates#973
Merged
pganssle merged 1 commit intodateutil:masterfrom Nov 3, 2019
Merged
Conversation
Since the strong cache uses operations in OrderedDict that are not thread-safe in Python 2, it is necessary to acquire a lock while updating the dictionary. When Python 2 support is dropped, we can likely refactor this to avoid locking.
e70ee45 to
6e92f21
Compare
Contributor
|
How confident are you that this is only needed in py2? it wouldnt be difficult to make the lock py2-only. |
Member
Author
|
@jbrockmendel Not terribly confident. It seems like it's from this closed bug in CPython, but I'm not sure if PyPy3 is still affected by it (if they ever were). This is also fixing another race condition that is definitely there in both versions, but only causes unnecessary cache misses as opposed to throwing errors. If we had a reasonable test for this, I'd probably just change |
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 of changes
Since the strong cache uses operations in OrderedDict that are not thread-safe in Python 2, it is necessary to acquire a lock while updating the dictionary.
When Python 2 support is dropped, we can likely refactor this to avoid locking.
I have a small script that reproduces the issue on Python 2.7, but unfortunately it only reproduces the issue intermittently, and in the current implementation seems to be prone to deadlocks (possibly that is another issue with the tz code..), so it is not really an ideal unit test.
Still, I'll include it here in case anyone wants to verify that this solution works:
Details
Closes #901.
Pull Request Checklist