Skip to content

Fix JVM <clinit> deadlock in Cosmos SDK accessor initialization #48667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jeet1995 wants to merge 12 commits into from
Closed

Fix JVM <clinit> deadlock in Cosmos SDK accessor initialization #48667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
02898e7
Fix JVM <clinit> deadlock in Cosmos SDK accessor initialization
jeet1995 Apr 1, 2026
a2677fa
Fix CHANGELOG.md PR link placeholder
jeet1995 Apr 1, 2026
51e9932
Address PR review feedback
jeet1995 Apr 2, 2026
2b5a98b
Rename misnamed getCosmosAsyncClientAccessor in CosmosDiagnosticsThre…
jeet1995 Apr 2, 2026
973865c
Fix regression test: restore all accessors after concurrent test
jeet1995 Apr 2, 2026
cd14443
Fix ensureClassInitialized for recursive <clinit> self-references
jeet1995 Apr 2, 2026
96a042f
Address review: add missing static{initialize()} blocks, improve test
jeet1995 Apr 2, 2026
5e11ce7
Replace in-process test with forked-JVM deadlock test
jeet1995 Apr 2, 2026
06a4f83
Remove reflection from ensureClassInitialized, fix <clinit> ordering
jeet1995 Apr 2, 2026
4d08a9f
Fix forked JVM test for Java 8 compatibility
jeet1995 Apr 2, 2026
6b4f89d
chore: trigger spring-data-cosmos CI for deadlock fix validation
jeet1995 Apr 2, 2026
b406765
Address review: fix test hang, add enforcement test, shorten CHANGELOG
jeet1995 Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
345 changes: 345 additions & 0 deletions ...-tests/src/test/java/com/azure/cosmos/implementation/ImplementationBridgeHelpersTest.java
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion sdk/cosmos/azure-cosmos/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
#### Breaking Changes

#### Bugs Fixed
Fixing an NPE caused due to boxed Boolean conversion. - See [PR 48656](https://github.com/Azure/azure-sdk-for-java/pull/48656/)
* Fixing an NPE caused due to boxed Boolean conversion. - See [PR 48656](https://github.com/Azure/azure-sdk-for-java/pull/48656/)
* Fixed JVM `<clinit>` deadlock when multiple threads concurrently trigger Cosmos SDK class loading for the first time. - See [PR 48667](https://github.com/Azure/azure-sdk-for-java/pull/48667)

Comment thread
jeet1995 marked this conversation as resolved.
#### Other Changes

Expand Down
2 changes: 2 additions & 0 deletions sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDiagnosticsContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,4 +1201,6 @@ public Integer getTargetMaxMicroBatchSize(CosmosDiagnosticsContext ctx) {
}
});
}

static { initialize(); }
}
5 changes: 3 additions & 2 deletions sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosItemSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
*/
public abstract class CosmosItemSerializer {

// Register the accessor before any static fields that may trigger other classes'
// <clinit> which need this accessor (e.g., DefaultCosmosItemSerializer).
static { initialize(); }

/**
* Gets the default Cosmos item serializer. This serializer is used by default when no custom serializer is
Expand Down Expand Up @@ -163,6 +166,4 @@ public ObjectMapper getItemObjectMapper(CosmosItemSerializer serializer) {
}
});
}

static { initialize(); }
}
2 changes: 2 additions & 0 deletions sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosRequestContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,4 +217,6 @@ public CosmosRequestContext create(OverridableRequestOptions requestOptions) {
}
);
}

static { initialize(); }
}
2 changes: 1 addition & 1 deletion ...e-cosmos/src/main/java/com/azure/cosmos/implementation/CosmosQueryRequestOptionsBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*/
public abstract class CosmosQueryRequestOptionsBase<T extends CosmosQueryRequestOptionsBase<?>> implements OverridableRequestOptions {
private final static ImplementationBridgeHelpers.CosmosDiagnosticsThresholdsHelper.CosmosDiagnosticsThresholdsAccessor thresholdsAccessor =
ImplementationBridgeHelpers.CosmosDiagnosticsThresholdsHelper.getCosmosAsyncClientAccessor();
ImplementationBridgeHelpers.CosmosDiagnosticsThresholdsHelper.getCosmosDiagnosticsThresholdsAccessor();

private ConsistencyLevel consistencyLevel;
private ReadConsistencyStrategy readConsistencyStrategy;
Expand Down
2 changes: 1 addition & 1 deletion ...e-cosmos/src/main/java/com/azure/cosmos/implementation/CosmosQueryRequestOptionsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

public final class CosmosQueryRequestOptionsImpl extends CosmosQueryRequestOptionsBase<CosmosQueryRequestOptionsImpl> {
private final static ImplementationBridgeHelpers.CosmosDiagnosticsThresholdsHelper.CosmosDiagnosticsThresholdsAccessor thresholdsAccessor =
ImplementationBridgeHelpers.CosmosDiagnosticsThresholdsHelper.getCosmosAsyncClientAccessor();
ImplementationBridgeHelpers.CosmosDiagnosticsThresholdsHelper.getCosmosDiagnosticsThresholdsAccessor();
private String partitionKeyRangeId;
private Boolean scanInQueryEnabled;
private Boolean emitVerboseTracesInQuery;
Expand Down
98 changes: 59 additions & 39 deletions ...ure-cosmos/src/main/java/com/azure/cosmos/implementation/ImplementationBridgeHelpers.java
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosItemRequestOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
*/
public class CosmosItemRequestOptions {
private final static ImplementationBridgeHelpers.CosmosDiagnosticsThresholdsHelper.CosmosDiagnosticsThresholdsAccessor thresholdsAccessor =
ImplementationBridgeHelpers.CosmosDiagnosticsThresholdsHelper.getCosmosAsyncClientAccessor();
ImplementationBridgeHelpers.CosmosDiagnosticsThresholdsHelper.getCosmosDiagnosticsThresholdsAccessor();

private ConsistencyLevel consistencyLevel;
private ReadConsistencyStrategy readConsistencyStrategy;
Expand Down
2 changes: 2 additions & 0 deletions sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosOperationDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,6 @@ static void initialize() {
.setCosmosOperationDetailsAccessor(
CosmosOperationDetails::new);
}

static { initialize(); }
}
1 change: 1 addition & 0 deletions sdk/spring/azure-spring-data-cosmos/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,3 +1169,4 @@ or contact [opencode@microsoft.com][coc_contact] with any additional questions o
[azure_cosmos_db_java_sdk_samples]: https://github.com/Azure-Samples/azure-cosmos-java-sql-api-samples



Loading