OAK-9447: Upgrade Mongo java driver to 5.2 #2226

Joscorbe · 2025-04-12T23:02:24Z

Starting from base PR created by rgambelli #1761

Some conflicts still need to be resolved before merging

* OAK-9447 * Conflict with trunk resolved * Conflict resolved * conflict resolved * Reordered imports like original classes and fixed oak-run about new mongodb-driver-sync * Reordered imports like original classes * Upgraded com.mongodb and org.bson versions in Import-Package * Restored original formatting * Restored original import ordering * Restored original import ordering --------- Co-authored-by: raffaega <raffaega@CI00298583> Co-authored-by: raffaega <raffaega@host.docker.internal> Co-authored-by: Raffaele Gambelli <r.gambelli@gmail.com> Co-authored-by: Raffaele Gambelli <raffaele.gambelli@cegeka.com>

github-actions · 2025-04-12T23:02:51Z

Commit-Check ❌

Commit rejected by Commit-Check.                                  
                                                                  
  (c).-.(c)    (c).-.(c)    (c).-.(c)    (c).-.(c)    (c).-.(c)  
   / ._. \      / ._. \      / ._. \      / ._. \      / ._. \   
 __\( C )/__  __\( H )/__  __\( E )/__  __\( C )/__  __\( K )/__ 
(_.-/'-'\-._)(_.-/'-'\-._)(_.-/'-'\-._)(_.-/'-'\-._)(_.-/'-'\-._)
   || E ||      || R ||      || R ||      || O ||      || R ||   
 _.' '-' '._  _.' '-' '._  _.' '-' '._  _.' '-' '._  _.' '-' '._ 
(.-./`-´\.-.)(.-./`-´\.-.)(.-./`-´\.-.)(.-./`-´\.-.)(.-./`-´\.-.)
 `-´     `-´  `-´     `-´  `-´     `-´  `-´     `-´  `-´     `-´ 
                                                                  
Commit rejected.                                                  
                                                                  
Type message check failed => Merge branch 'OAK-9447-joscorbe' of https://github.com/apache/jackrabbit-oak into OAK-9447-joscorbe

 
It doesn't match regex: ^OAK-\d+:?\s\S+.*
The commit message must start with 'OAK-<ID>[:] ' followed by some descriptive text
Suggest: Please check your commit message whether it matches above regex

Joscorbe · 2025-04-13T14:27:21Z

This PR will likely contain many commits, so plan it to squash it into a single commit when ready.

…vailability

Joscorbe · 2025-04-26T00:03:43Z

...store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterInfoTest.java

@@ -89,11 +89,11 @@ public void readWriteMode() throws InterruptedException {
        assertEquals(WriteConcern.MAJORITY, mem.getWriteConcern());

        op = new UpdateOp(list.get(0).getId(), false);
-        op.set("readWriteMode", "read:nearest, write:fsynced");
+        op.set("readWriteMode", "read:nearest, write:w2");


FSYNCED doesn't exist anymore, the correct replacement is W2.

Joscorbe · 2025-04-26T00:04:56Z

...re-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobThroughPutTest.java

 //        bimap.put(WriteConcern.REPLICAS_SAFE,"REPLICAS_SAFE");
-        bimap.put(WriteConcern.SAFE,"SAFE");
+        bimap.put(WriteConcern.ACKNOWLEDGED,"ACKNOWLEDGED");


Those WriteConcerns are removed:

FSYNC_SAFE and JOURNAL_SAFE replaced by JOURNALED

NORMAL and SAFE replaced by ACKNOWLEDGED

Joscorbe · 2025-04-26T00:48:33Z

...ument/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java

@@ -2361,8 +2364,7 @@ private boolean withClientSession() {
    }

    private boolean secondariesWithinAcceptableLag() {
-        return getClient().getReplicaSetStatus() == null
-                || connection.getStatus().getReplicaSetLagEstimate() < acceptableLagMillis;
+        return connection.getStatus().getReplicaSetLagEstimate() < acceptableLagMillis;


getStatus() can't be null.

getReplicaSetLagEstimate() returns 0 when Mongo is not a replica set.

Joscorbe · 2025-04-26T00:51:05Z

...nt/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java

 import static com.mongodb.client.model.Filters.or;
 import static com.mongodb.client.model.Projections.include;
 import static com.mongodb.client.model.Sorts.ascending;
+
+import static java.util.Collections.emptyList;


Not keeping the old imports ordering because they made no sense.

Joscorbe · 2025-04-26T00:51:23Z

...ument/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java

@@ -99,19 +87,30 @@
 import org.slf4j.LoggerFactory;

 import com.mongodb.BasicDBObject;
+import com.mongodb.ConnectionString;


Not keeping the old imports ordering because they made no sense.

…cernIT

Joscorbe · 2025-04-28T09:51:02Z

A few references about the migration:
https://www.mongodb.com/docs/drivers/java/sync/v5.2/reference/upgrade/#breaking-changes
https://www.mongodb.com/docs/drivers/java/sync/v5.2/reference/legacy/#api-changes

…ion import.

sonarqubecloud · 2025-04-28T17:40:20Z

Quality Gate failed

Failed conditions
75.7% Coverage on New Code (required ≥ 80%)
C Reliability Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

nfsantos

The new Java driver seems to work correctly with indexing.

Joscorbe · 2025-05-05T17:52:45Z

Thanks @nfsantos!

...src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java

rishabhdaim · 2025-05-12T04:25:56Z

oak-store-document/pom.xml

-              com.mongodb*;version="[3.8, 4)";resolution:=optional,
-              org.bson*;version="[3.8, 4)";resolution:=optional,
+              com.mongodb*;version="[5.2, 5.3)";resolution:=optional,
+              org.bson*;version="[5.2, 5.3)";resolution:=optional,


we already have version 5.5.0 released for mongo-driver-sync [1]

[1] https://mvnrepository.com/artifact/org.mongodb/mongodb-driver-sync

Yes, but we should test it before allowing it. We can do it in a new PR after this is merged, to avoid further delays on this PR.

...ument/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java

rishabhdaim · 2025-05-12T04:34:33Z

...-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java

-        WriteConcern wc = new MongoClientURI(requireNonNull(uri), builder)
-                .getOptions().getWriteConcern();
-        return !WC_UNKNOWN.equals(wc);
+        ConnectionString connectionString = new ConnectionString(requireNonNull(uri));


why do we need need to change this behavior here, this might cause an regression.

The behavior is the same: both implementations check whether the URI explicitly sets a writeConcern. The previous version used a workaround with WC_UNKNOWN to detect this, but the new API exposes this check directly via getWriteConcern().

Since now there is a native method in the driver that does exactly what we need, I don't think we need the workaround anymore.

There are tests that checks this and I introduced a few more test cases in MongoConnectionTest.java to ensure no regressions are introduced.

rishabhdaim · 2025-05-12T04:38:05Z

...t/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java

@@ -155,18 +153,6 @@ public void setUpdateLimit() throws Exception {
        assertEquals(17, store.getUpdateLimit());
    }

-    @Test
-    public void keepAlive() throws Exception {


keepAlive config is only marked as deprecated not removed. I would suggest to keep these test till we remove that.

This test checks for getMongoClientOptions().isSocketKeepAlive(), which doesn't exist at all in modern driver, so this test would have no sense at all.

I marked keepAlive and all related properties as deprecated just to help to detect any uses in any application using Oak as dependency, to avoid breaking changes, but all those options should be completely removed.

rishabhdaim · 2025-05-12T04:41:24Z

...ment/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoConnectionTest.java

@@ -85,26 +95,6 @@ public void sufficientReadConcern() throws Exception {
        sufficientReadConcernSingleNode(ReadConcern.MAJORITY, true);
    }

-    @Test
-    public void socketKeepAlive() throws Exception {


Again, I would keep this alive till we remove the config.

As before, Mongo doesn't have any related isSocketKeepAlive method anymore. The only way to keep this test is to make it a NOOP test, which doesn't make much sense to me.

In Mongo Java Driver 3.6 it was already deprecated, and in 4.0 removed.

…ced.

# Conflicts: # oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java

…bit-oak into OAK-9447-joscorbe

Joscorbe added 2 commits April 13, 2025 02:02

OAK-9447: cleanup formatting changes

b1401de

OAK-9447: cleanup formatting changes

b620139

Joscorbe added 4 commits April 13, 2025 17:05

OAK-9447: Fix build and removed unwanted changes due to conflicts.

20c5f8c

OAK-9447: Removed some warnings and reverted some unwanted changes

3d24430

OAK-9447: Cleanup

f8f86a0

OAK-9447: Some imports ordering and use ping command to check Mongo a…

9582ad9

…vailability

Joscorbe commented Apr 26, 2025

View reviewed changes

OAK-9447: reverted some changes in imports and keep functionality.

9fcd849

Joscorbe commented Apr 26, 2025

View reviewed changes

Joscorbe added 5 commits April 26, 2025 12:01

OAK-9447: revert some formatting changes.

187da90

OAK-9447: avoid formatting changes

473aa40

OAK-9447

1223fa9

OAK-9447: Restore functionality of hasWriteConcern.

29a602b

OAK-9447: Some empty lines cleaning and fix ReplicaSetDefaultWriteCon…

1ee37e2

…cernIT

Joscorbe marked this pull request as ready for review April 28, 2025 09:39

Joscorbe changed the title ~~OAK-9447: Upgrade Mongo java driver to 5.2 (WIP)~~ OAK-9447: Upgrade Mongo java driver to 5.2 Apr 28, 2025

Joscorbe requested review from rishabhdaim and nfsantos April 28, 2025 09:39

OAK-9447: remove empty line

f9ea208

Joscorbe added 2 commits April 28, 2025 17:47

OAK-9447: Bump to version 5.2.1, since 5.2.0 requires an OSGi annotat…

d1d7b88

…ion import.

OAK-9447: Fix import-packages.

974372e

nfsantos approved these changes Apr 29, 2025

View reviewed changes

rishabhdaim requested changes May 12, 2025

View reviewed changes

Joscorbe and others added 3 commits May 15, 2025 16:43

OAK-9447: Restored previous annotations, as they are not always enfor…

a64e674

…ced.

OAK-9447: Applied PR suggestions.

0e256eb

Merge branch 'trunk' into OAK-9447-joscorbe

f703583

Joscorbe requested a review from rishabhdaim May 15, 2025 14:55

Joscorbe added 3 commits May 20, 2025 16:09

OAK-9447: Add back mongoURI

9c1cf4e

Merge remote-tracking branch 'origin/trunk' into OAK-9447-joscorbe

be7d9ed

# Conflicts: # oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java

Merge branch 'OAK-9447-joscorbe' of https://github.com/apache/jackrab…

2942f37

…bit-oak into OAK-9447-joscorbe

rishabhdaim approved these changes Jun 6, 2025

View reviewed changes

OAK-9447: Upgrade Mongo java driver to 5.2 #2226

Are you sure you want to change the base?

OAK-9447: Upgrade Mongo java driver to 5.2 #2226

Uh oh!

Conversation

Joscorbe commented Apr 12, 2025

Uh oh!

github-actions bot commented Apr 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Commit-Check ❌

Uh oh!

Joscorbe commented Apr 13, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Joscorbe commented Apr 28, 2025

Uh oh!

sonarqubecloud bot commented Apr 28, 2025

Quality Gate failed

Uh oh!

nfsantos left a comment

Choose a reason for hiding this comment

Uh oh!

Joscorbe commented May 5, 2025

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Apr 12, 2025 •

edited

Loading