Fix CNIEnv concurrency issue #3529
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.
This is very similar to #3522, and addresses another facet of the same underlying problem (CNIEnv not being safe to use concurrently).
Failure is typically showing-up with
images
in integration tests (on my laptop, shows up after 20+ runs).This is not a good long-term solution (the right solution is to rewrite CNIEnv with concurrency in mind) - but it will alleviate the problem in a bunch of cases for now.