Merge branch 'main' into fix-github-release-notes

Author: atandon2024

driver-core/src/main/com/mongodb/internal/connection/netty/NettyByteBuf.java

@@ -251,7 +251,7 @@ public ByteBuf limit(final int newLimit) {
 
     @Override
     public ByteBuf asReadOnly() {
-        return new NettyByteBuf(proxied.asReadOnly().retain(), false);
+        return this;
     }
 
     @Override

driver-core/src/test/functional/com/mongodb/internal/connection/CommandHelperSpecification.groovy

@@ -25,6 +25,7 @@ import com.mongodb.connection.SocketSettings
 import com.mongodb.internal.connection.netty.NettyStreamFactory
 import org.bson.BsonDocument
 import org.bson.BsonInt32
+import spock.lang.Ignore
 import spock.lang.Specification
 
 import java.util.concurrent.CountDownLatch
@@ -52,9 +53,11 @@ class CommandHelperSpecification extends Specification {
     }
 
     def cleanup() {
+        InternalStreamConnection.setRecordEverything(false)
         connection?.close()
     }
 
+    @Ignore("JAVA-5982")
     def 'should execute command asynchronously'() {
         when:
         BsonDocument receivedDocument = null

driver-core/src/test/unit/com/mongodb/internal/TimeoutContextTest.java

@@ -331,9 +331,10 @@ static Stream<Arguments> shouldChooseTimeoutMsWhenItIsLessThenConnectTimeoutMS()
         );
     }
 
-    @ParameterizedTest
-    @MethodSource
     @DisplayName("should choose timeoutMS when timeoutMS is less than connectTimeoutMS")
+    @ParameterizedTest(name = "should choose timeoutMS when timeoutMS is less than connectTimeoutMS. "
+            + "Parameters: connectTimeoutMS: {0}, timeoutMS: {1}, expected: {2}")
+    @MethodSource
     void shouldChooseTimeoutMsWhenItIsLessThenConnectTimeoutMS(final Long connectTimeoutMS,
                                                           final Long timeoutMS,
                                                           final long expected) {
@@ -345,7 +346,7 @@ void shouldChooseTimeoutMsWhenItIsLessThenConnectTimeoutMS(final Long connectTim
                         0));
 
         long calculatedTimeoutMS = timeoutContext.getConnectTimeoutMs();
-        assertTrue(expected - calculatedTimeoutMS <= 1);
+        assertTrue(expected - calculatedTimeoutMS <= 2);
     }
 
     private TimeoutContextTest() {

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/TimeoutHelper.java

@@ -55,18 +55,29 @@ public static <T> MongoCollection<T> collectionWithTimeout(final MongoCollection
 
     public static <T> Mono<MongoCollection<T>> collectionWithTimeoutMono(final MongoCollection<T> collection,
                                                                          @Nullable final Timeout timeout) {
+       return collectionWithTimeoutMono(collection, timeout, DEFAULT_TIMEOUT_MESSAGE);
+    }
+
+    public static <T> Mono<MongoCollection<T>> collectionWithTimeoutMono(final MongoCollection<T> collection,
+                                                                         @Nullable final Timeout timeout,
+                                                                         final String message) {
         try {
-            return Mono.just(collectionWithTimeout(collection, timeout));
+            return Mono.just(collectionWithTimeout(collection, timeout, message));
         } catch (MongoOperationTimeoutException e) {
             return Mono.error(e);
         }
     }
 
     public static <T> Mono<MongoCollection<T>> collectionWithTimeoutDeferred(final MongoCollection<T> collection,
                                                                              @Nullable final Timeout timeout) {
-        return Mono.defer(() -> collectionWithTimeoutMono(collection, timeout));
+        return collectionWithTimeoutDeferred(collection, timeout, DEFAULT_TIMEOUT_MESSAGE);
     }
 
+    public static <T> Mono<MongoCollection<T>> collectionWithTimeoutDeferred(final MongoCollection<T> collection,
+                                                                             @Nullable final Timeout timeout,
+                                                                             final String message) {
+        return Mono.defer(() -> collectionWithTimeoutMono(collection, timeout, message));
+    }
 
     public static MongoDatabase databaseWithTimeout(final MongoDatabase database,
                                                     @Nullable final Timeout timeout) {

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/gridfs/GridFSUploadPublisherImpl.java

@@ -54,7 +54,8 @@
  */
 public final class GridFSUploadPublisherImpl implements GridFSUploadPublisher<Void> {
 
-    private static final String TIMEOUT_ERROR_MESSAGE = "Saving chunks exceeded the timeout limit.";
+    private static final String TIMEOUT_ERROR_MESSAGE_CHUNKS_SAVING = "Saving chunks exceeded the timeout limit.";
+    private static final String TIMEOUT_ERROR_MESSAGE_UPLOAD_CANCELLATION = "Upload cancellation exceeded the timeout limit.";
     private static final Document PROJECTION = new Document("_id", 1);
     private static final Document FILES_INDEX = new Document("filename", 1).append("uploadDate", 1);
     private static final Document CHUNKS_INDEX = new Document("files_id", 1).append("n", 1);
@@ -226,8 +227,8 @@ private Mono<Long> createSaveChunksMono(final AtomicBoolean terminated, @Nullabl
                             .append("data", data);
 
                     Publisher<InsertOneResult> insertOnePublisher = clientSession == null
-                            ? collectionWithTimeout(chunksCollection, timeout, TIMEOUT_ERROR_MESSAGE).insertOne(chunkDocument)
-                            : collectionWithTimeout(chunksCollection, timeout, TIMEOUT_ERROR_MESSAGE)
+                            ? collectionWithTimeout(chunksCollection, timeout, TIMEOUT_ERROR_MESSAGE_CHUNKS_SAVING).insertOne(chunkDocument)
+                            : collectionWithTimeout(chunksCollection, timeout, TIMEOUT_ERROR_MESSAGE_CHUNKS_SAVING)
                                .insertOne(clientSession, chunkDocument);
 
                     return Mono.from(insertOnePublisher).thenReturn(data.length());
@@ -270,7 +271,8 @@ private Mono<InsertOneResult> createSaveFileDataMono(final AtomicBoolean termina
     }
 
     private Mono<DeleteResult> createCancellationMono(final AtomicBoolean terminated, @Nullable final Timeout timeout) {
-        Mono<MongoCollection<Document>> chunksCollectionMono = collectionWithTimeoutDeferred(chunksCollection, timeout);
+        Mono<MongoCollection<Document>> chunksCollectionMono = collectionWithTimeoutDeferred(chunksCollection, timeout,
+                TIMEOUT_ERROR_MESSAGE_UPLOAD_CANCELLATION);
         if (terminated.compareAndSet(false, true)) {
             if (clientSession != null) {
                 return chunksCollectionMono.flatMap(collection -> Mono.from(collection