ComplexCancellable: Fix race condition#597
Merged
rschmitt merged 1 commit intoapache:masterfrom Jan 15, 2026
Merged
Conversation
I discovered a race condition while investigating a sporadic test failure in the client: ``` [ERROR] HttpMinimalIntegrationTests$H2Tls>AbstractHttpAsyncFundamentalsTest.testSequentialGetRequests:86 » Execution org.apache.hc.core5.http2.H2StreamResetException: Cancelled ``` I discovered that two threads are somehow racing when calling `ComplexCancellable.setDependency()`: ``` setDependency dep=org.apache.hc.client5.http.impl.async.MinimalH2AsyncClient$$Lambda$655/251536271@633478cb ct=ForkJoinPool-1-worker-2 setDependency dep=[id=1, reserved=false, removeClosed=false, localClosed=false, localReset=false] ct=httpclient-dispatch-1 setDependency dep=org.apache.hc.client5.http.impl.async.MinimalH2AsyncClient$$Lambda$655/251536271@2e66671a ct=ForkJoinPool-1-worker-2 setDependency dep=[id=3, reserved=false, removeClosed=false, localClosed=false, localReset=false] ct=httpclient-dispatch-1 setDependency dep=org.apache.hc.client5.http.impl.async.MinimalH2AsyncClient$$Lambda$655/251536271@32f4e96 ct=ForkJoinPool-1-worker-2 setDependency dep=[id=5, reserved=false, removeClosed=false, localClosed=false, localReset=false] ct=httpclient-dispatch-1 ``` The implementation of `setDependency` was performing a single CAS and interpreting failure to mean that the mark bit had been set -- in other words, that another thread had called `cancel()`, rather than `setDependency()`. This change corrects the implementation of `setDependency` by having it run the CAS in a loop. On each update failure, it checks if the mark bit has been set (nothing ever unsets it). If so, it calls `dependency.cancel()` and returns; else, it just tries again.
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
2 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.
I discovered a race condition while investigating a sporadic test failure in the client:
It turned out that two threads are somehow racing when calling
ComplexCancellable.setDependency():The implementation of
setDependencywas performing a single CAS and interpreting failure to mean that the mark bit had been set -- in other words, that another thread had calledcancel(), rather thansetDependency().This change corrects the implementation of
setDependencyby having it run the CAS in a loop. On each update failure, it checks if the mark bit has been set (nothing ever unsets it). If so, it callsdependency.cancel()and returns; else, it just tries again.