This is an automated email from the ASF dual-hosted git repository. joscorbe pushed a commit to branch OAK-11835 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit e09c15ceb5b31607e0aa629d419bd8211477bd31 Author: Jose Cordero <[email protected]> AuthorDate: Tue Aug 5 04:37:25 2025 +0200 OAK-11835: Fix default leaseSocketTimeout. --- .../jackrabbit/oak/plugins/document/DocumentNodeStoreService.java | 2 +- .../oak/plugins/document/mongo/MongoDocumentNodeStoreBuilderBase.java | 3 ++- .../oak/plugins/document/mongo/MongoConnectionPoolSettingsTest.java | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java index 0a4e0d8a01..e17f2d4788 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java @@ -142,7 +142,7 @@ public class DocumentNodeStoreService { static final boolean DEFAULT_EMBEDDED_VERIFICATION_ENABLED = true; static final int DEFAULT_FULL_GC_MODE = 0; static final int DEFAULT_FULL_GC_GENERATION = 0; - static final int DEFAULT_MONGO_LEASE_SO_TIMEOUT_MILLIS = 30000; + public static final int DEFAULT_MONGO_LEASE_SO_TIMEOUT_MILLIS = 30000; // MongoDB Connection Pool Settings public static final int DEFAULT_MONGO_MAX_POOL_SIZE = 100; public static final int DEFAULT_MONGO_MIN_POOL_SIZE = 0; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentNodeStoreBuilderBase.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentNodeStoreBuilderBase.java index f561cb4959..fea6799ea5 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentNodeStoreBuilderBase.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentNodeStoreBuilderBase.java @@ -25,6 +25,7 @@ import com.mongodb.client.MongoClient; import org.apache.jackrabbit.oak.plugins.blob.ReferencedBlob; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreBuilder; +import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; import org.apache.jackrabbit.oak.plugins.document.MissingLastRevSeeker; import org.apache.jackrabbit.oak.plugins.document.VersionGCSupport; @@ -47,7 +48,7 @@ public abstract class MongoDocumentNodeStoreBuilderBase<T extends MongoDocumentN private MongoStatus mongoStatus; private long maxReplicationLagMillis = TimeUnit.HOURS.toMillis(6); private boolean clientSessionDisabled = false; - private int leaseSocketTimeout = 0; + private int leaseSocketTimeout = DocumentNodeStoreService.DEFAULT_MONGO_LEASE_SO_TIMEOUT_MILLIS; private String uri; private String name; private String collectionCompressionType; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoConnectionPoolSettingsTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoConnectionPoolSettingsTest.java index 9f9bcb4f28..90f1d8329d 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoConnectionPoolSettingsTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoConnectionPoolSettingsTest.java @@ -166,12 +166,11 @@ public class MongoConnectionPoolSettingsTest { @Test public void testLeaseConnectionWithDefaultTimeout() throws Exception { MongoDocumentNodeStoreBuilder builder = createTestBuilder(); - // Use default lease socket timeout (20000ms per DocumentNodeStoreService.DEFAULT_MONGO_LEASE_SO_TIMEOUT_MILLIS) MongoClientSettings settings = builder.buildMongoClientSettings(true); // Lease connection should use default lease socket timeout - assertEquals(60000, settings.getSocketSettings().getReadTimeout(TimeUnit.MILLISECONDS)); + assertEquals(30000, settings.getSocketSettings().getReadTimeout(TimeUnit.MILLISECONDS)); } @Test
