[release/9.0] Fix thread static cleanup paths #107554
Merged
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.
Backport of #107438 to release/9.0
/cc @davidwrighton
Customer Impact
Cleanup of thread statics was taking a lock at an inappropriate time, and research into that problem identified that collectible thread statics were not working correctly. These issues are now fixed.
Regression
This was regressed with the large statics rewrite this summer. Thread statics for collectible assemblies were not leak free in .NET 8.
Testing
This fix fixes an issue that was causing intermittent assertion failures.
This fix was verified with manual inspection as well as a bespoke stress test designed to stress thread statics on collectible assemblies.
Risk
Medium, thread statics cleanup is a not highly tested scenario due to our general lack of VM stress tests in the test suite. We are able to effectively find issues with normal thread statics, but statics on collectible assemblies are not highly stressed. This risk was mitigated with a bespoke thread statics for collectible assemblies stress test that I wrote, but we don't have good coverage here in CI, and there isn't a place to put the stress test.
IMPORTANT: If this backport is for a servicing release, please verify that:
The PR target branch is
release/X.0-staging
, notrelease/X.0
.If the change touches code that ships in a NuGet package, you have added the necessary package authoring and gotten it explicitly reviewed.