Merge branch 'main' into NODE-6552-fix-perf-tests

Author: W-A-James

src/cmap/connection.ts

@@ -769,7 +769,7 @@ export class SizedMessageTransform extends Transform {
   connection: Connection;
 
   constructor({ connection }: { connection: Connection }) {
-    super({ objectMode: false });
+    super({ writableObjectMode: false, readableObjectMode: true });
     this.bufferPool = new BufferPool();
     this.connection = connection;
   }

test/benchmarks/mongoBench/suites/singleBench.js

@@ -36,8 +36,8 @@ function makeSingleBench(suite) {
     )
     .benchmark('runCommand', benchmark =>
       benchmark
-        // { hello: true } is 13 bytes. However the legacy hello was 16 bytes, to preserve history comparison data we leave this value as is.
-        .taskSize(0.16)
+        // { hello: true } is 13 bytes of BSON x 10,000 iterations
+        .taskSize(0.13)
         .setup(makeClient)
         .setup(connectClient)
         .setup(initDb)

test/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-returned-connection-maxConnecting.json

@@ -23,6 +23,7 @@
     }
   },
   "poolOptions": {
+    "maxConnecting": 2,
     "maxPoolSize": 10,
     "waitQueueTimeoutMS": 5000
   },
@@ -72,9 +73,8 @@
       "connection": "conn0"
     },
     {
-      "name": "waitForEvent",
-      "event": "ConnectionCheckedOut",
-      "count": 4
+      "name": "wait",
+      "ms": 100
     }
   ],
   "events": [
@@ -104,14 +104,6 @@
       "type": "ConnectionCheckedOut",
       "connectionId": 1,
       "address": 42
-    },
-    {
-      "type": "ConnectionCheckedOut",
-      "address": 42
-    },
-    {
-      "type": "ConnectionCheckedOut",
-      "address": 42
     }
   ],
   "ignore": [

test/spec/connection-monitoring-and-pooling/cmap-format/pool-checkout-returned-connection-maxConnecting.yml

@@ -15,6 +15,7 @@ failPoint:
     blockConnection: true
     blockTimeMS: 750
 poolOptions:
+  maxConnecting: 2
   maxPoolSize: 10
   waitQueueTimeoutMS: 5000
 operations:
@@ -45,14 +46,13 @@ operations:
     count: 4
   - name: wait
     ms: 100
-  # check original connection back in, so the thread that isn't
-  # currently establishing will become unblocked. Then wait for
-  # all threads to complete.
+  # Check original connection back in, so one of the waiting threads can check
+  # out the idle connection before the two new connections are ready.
   - name: checkIn
     connection: conn0
-  - name: waitForEvent
-    event: ConnectionCheckedOut
-    count: 4
+  # Wait for 100ms to let one of the blocked checkOut operations complete.
+  - name: wait
+    ms: 100
 events:
   # main thread checking out a Connection and holding it
   - type: ConnectionCreated
@@ -69,15 +69,13 @@ events:
   - type: ConnectionCheckedIn
     connectionId: 1
     address: 42
-  # remaining thread checking out the returned Connection
+  # Another thread checks out the returned Connection before the two new
+  # connections are checked out.
   - type: ConnectionCheckedOut
     connectionId: 1
     address: 42
-  # first two threads finishing Connection establishment
-  - type: ConnectionCheckedOut
-    address: 42
-  - type: ConnectionCheckedOut
-    address: 42
+  # Events after this can come in different orders but still be valid.
+  # See DRIVERS-2223 for details.
 ignore:
   - ConnectionPoolReady
   - ConnectionClosed

test/unit/cmap/connection.test.ts

@@ -11,7 +11,8 @@ import {
   MongoClientAuthProviders,
   MongoDBCollectionNamespace,
   MongoNetworkTimeoutError,
-  ns
+  ns,
+  SizedMessageTransform
 } from '../../mongodb';
 import * as mock from '../../tools/mongodb-mock/index';
 import { getSymbolFrom } from '../../tools/utils';
@@ -323,4 +324,19 @@ describe('new Connection()', function () {
       });
     });
   });
+
+  describe('SizedMessageTransform', function () {
+    it('parses chunks of wire messages', function () {
+      const stream = new SizedMessageTransform({ connection: {} as any });
+      // Message of length 4 + 4 = 8
+      stream.write(Buffer.from([8, 0, 0, 0]));
+      stream.write(Buffer.from([1, 2, 3, 4]));
+      // Message of length 4 + 2 = 6, chunked differently
+      stream.write(Buffer.from([6, 0, 0]));
+      stream.write(Buffer.from([0, 5, 6]));
+      expect(stream.read(1)).to.deep.equal(Buffer.from([8, 0, 0, 0, 1, 2, 3, 4]));
+      expect(stream.read(1)).to.deep.equal(Buffer.from([6, 0, 0, 0, 5, 6]));
+      expect(stream.read(1)).to.equal(null);
+    });
+  });
 });