CBL-8402 : Fix data race on SerialExecutor.currentThread#495
Merged
Conversation
Make currentThread an AtomicLong so isInsideExecutor() reads a consistent, visible value across pool threads. Clear it with compareAndSet in the finally block so a task that has already claimed the thread for the next run is not cleared.
|
This is a release branch and commits are restricted. Please confirm this PR is one of the following:
|
Collaborator
Author
|
Fix an issue reported by QE for 4.1.0. |
borrrden
approved these changes
Jun 8, 2026
borrrden
added a commit
that referenced
this pull request
Jul 1, 2026
* Fix the tests to pass with the addition of crash logging (#493) * CBL-8402 : Fix data race on SerialExecutor.currentThread (#495) Make currentThread an AtomicLong so isInsideExecutor() reads a consistent, visible value across pool threads. Clear it with compareAndSet in the finally block so a task that has already claimed the thread for the next run is not cleared. * CBL-8389 : Fix build and static analysis issues in kt-serialization API changes (#498) * Replace var with explicit FLDict type in Document.setContent (common is compiled at Java 8) * Suppress PMD SingularField and SpotBugs URF_UNREAD_FIELD on Document.extraBackingStore (keep-alive field) * Add null check on FLValue.fromData() result in Document.setContent (NP_NULL_ON_SOME_PATH) * Move serialization tests from test/java to test/kotlin so that only the android-ktx test builds compile them : - FleeceSerializationTest.kt moved as-is - ResultTest.kt renamed to ResultSerializationTest.kt - Serialization test and TestModel extracted from CollectionTest.kt into new CollectionSerializationTest.kt * Fix incoming BLE L2CAP socket double-free on connection teardown (#499) btAttached() (incoming) now calls c4socket_retain, matching btOpen(), to balance the c4socket_release in NativeC4Socket_closed. Without it the incoming socket was double-freed on teardown (SIGABRT, invalid refCount -6666666). --------- Co-authored-by: Pasin Suriyentrakorn <pasin@couchbase.com>
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.
Make currentThread an AtomicLong so isInsideExecutor() reads a consistent, visible value across pool threads. Clear it with compareAndSet in the finally block so a task that has already claimed the thread for the next run is not cleared.