Merge branch 'main' into NODE-7306

Author: PavelSafronov

drivers-evergreen-tools

@@ -233,7 +233,7 @@ export class ConnectionPool extends TypedEventEmitter<ConnectionPoolEvents> {
     this.mongoLogger = this.server.topology.client?.mongoLogger;
     this.component = 'connection';
 
-    process.nextTick(() => {
+    queueMicrotask(() => {
       this.emitAndLog(ConnectionPool.CONNECTION_POOL_CREATED, new ConnectionPoolCreatedEvent(this));
     });
   }
@@ -344,7 +344,7 @@ export class ConnectionPool extends TypedEventEmitter<ConnectionPoolEvents> {
     });
 
     this.waitQueue.push(waitQueueMember);
-    process.nextTick(() => this.processWaitQueue());
+    queueMicrotask(() => this.processWaitQueue());
 
     try {
       timeout?.throwIfExpired();
@@ -407,7 +407,7 @@ export class ConnectionPool extends TypedEventEmitter<ConnectionPoolEvents> {
       this.destroyConnection(connection, reason);
     }
 
-    process.nextTick(() => this.processWaitQueue());
+    queueMicrotask(() => this.processWaitQueue());
   }
 
   /**
@@ -463,7 +463,7 @@ export class ConnectionPool extends TypedEventEmitter<ConnectionPoolEvents> {
     }
 
     if (interruptInUseConnections) {
-      process.nextTick(() => this.interruptInUseConnections(oldGeneration));
+      queueMicrotask(() => this.interruptInUseConnections(oldGeneration));
     }
 
     this.processWaitQueue();
@@ -704,7 +704,7 @@ export class ConnectionPool extends TypedEventEmitter<ConnectionPoolEvents> {
       this.createConnection((err, connection) => {
         if (!err && connection) {
           this.connections.push(connection);
-          process.nextTick(() => this.processWaitQueue());
+          queueMicrotask(() => this.processWaitQueue());
         }
         if (this.poolState === PoolState.ready) {
           clearTimeout(this.minPoolSizeTimer);
@@ -811,7 +811,7 @@ export class ConnectionPool extends TypedEventEmitter<ConnectionPoolEvents> {
             waitQueueMember.resolve(connection);
           }
         }
-        process.nextTick(() => this.processWaitQueue());
+        queueMicrotask(() => this.processWaitQueue());
       });
     }
     this.processingWaitQueue = false;

src/cmap/connection_pool.ts

@@ -167,7 +167,7 @@ export class GridFSBucketWriteStream extends Writable {
         }
       );
     } else {
-      return process.nextTick(callback);
+      return queueMicrotask(callback);
     }
   }
 
@@ -190,7 +190,7 @@ export class GridFSBucketWriteStream extends Writable {
   /** @internal */
   override _final(callback: (error?: Error | null) => void): void {
     if (this.state.streamEnd) {
-      return process.nextTick(callback);
+      return queueMicrotask(callback);
     }
     this.state.streamEnd = true;
     writeRemnant(this, callback);
@@ -222,11 +222,11 @@ export class GridFSBucketWriteStream extends Writable {
 
 function handleError(stream: GridFSBucketWriteStream, error: Error, callback: Callback): void {
   if (stream.state.errored) {
-    process.nextTick(callback);
+    queueMicrotask(callback);
     return;
   }
   stream.state.errored = true;
-  process.nextTick(callback, error);
+  queueMicrotask(() => callback(error));
 }
 
 function createChunkDoc(filesId: ObjectId, n: number, data: Buffer): GridFSChunk {
@@ -285,7 +285,7 @@ async function checkChunksIndex(stream: GridFSBucketWriteStream): Promise<void>
 
 function checkDone(stream: GridFSBucketWriteStream, callback: Callback): void {
   if (stream.done) {
-    return process.nextTick(callback);
+    return queueMicrotask(callback);
   }
 
   if (stream.state.streamEnd && stream.state.outstandingRequests === 0 && !stream.state.errored) {
@@ -329,7 +329,7 @@ function checkDone(stream: GridFSBucketWriteStream, callback: Callback): void {
     return;
   }
 
-  process.nextTick(callback);
+  queueMicrotask(callback);
 }
 
 async function checkIndexes(stream: GridFSBucketWriteStream): Promise<void> {
@@ -427,7 +427,7 @@ function doWrite(
   if (stream.pos + inputBuf.length < stream.chunkSizeBytes) {
     inputBuf.copy(stream.bufToStore, stream.pos);
     stream.pos += inputBuf.length;
-    process.nextTick(callback);
+    queueMicrotask(callback);
     return;
   }
 
@@ -532,7 +532,7 @@ function writeRemnant(stream: GridFSBucketWriteStream, callback: Callback): void
 
 function isAborted(stream: GridFSBucketWriteStream, callback: Callback<void>): boolean {
   if (stream.state.aborted) {
-    process.nextTick(callback, new MongoAPIError('Stream has been aborted'));
+    queueMicrotask(() => callback(new MongoAPIError('Stream has been aborted')));
     return true;
   }
   return false;

src/gridfs/upload.ts

@@ -428,7 +428,7 @@ function checkServer(monitor: Monitor, callback: Callback<Document | null>) {
 function monitorServer(monitor: Monitor) {
   return (callback: Callback) => {
     if (monitor.s.state === STATE_MONITORING) {
-      process.nextTick(callback);
+      queueMicrotask(callback);
       return;
     }
     stateTransition(monitor, STATE_MONITORING);

src/sdam/monitor.ts

@@ -416,7 +416,7 @@ export class Server extends TypedEventEmitter<ServerEvents> {
           error.addErrorLabel(MongoErrorLabel.ResetPool);
         }
         markServerUnknown(this, error);
-        process.nextTick(() => this.requestCheck());
+        queueMicrotask(() => this.requestCheck());
         return;
       }
 

src/sdam/server.ts

@@ -1078,7 +1078,7 @@ function processWaitQueue(topology: Topology) {
   if (topology.waitQueue.length > 0) {
     // ensure all server monitors attempt monitoring soon
     for (const [, server] of topology.s.servers) {
-      process.nextTick(function scheduleServerCheck() {
+      queueMicrotask(function scheduleServerCheck() {
         return server.requestCheck();
       });
     }

src/sdam/topology.ts

@@ -107,8 +107,18 @@ describe('Sessions Prose Tests', () => {
       expect(allResults).to.have.lengthOf(operations.length);
       expect(events).to.have.lengthOf(operations.length);
 
-      // This is a guarantee in node, unless you are performing a transaction (which is not being done in this test)
-      expect(new Set(events.map(ev => ev.command.lsid.id.toString('hex')))).to.have.lengthOf(1);
+      // Previous version of this test was too strict: we were expecting that only one session be used for this scenario.
+      // That was possible at the time because the operations were simple enough and the server fast enough that the operations would complete serially.
+      //
+      // However, with a more complex operation bulkWrite (like `Array.from({ length: 100_000 }).map(() => ({ insertOne: { document: { a: 1 } } })),`),
+      // it's entirely possible and expected that bulkWrite would introduce a second session due to the time it takes to process all the inserts.
+      //
+      // The important bit of the test is that the number of sessions is less than the number of concurrent operations, so now instead of expecting exactly 1 session,
+      // we just expect less than operations.length - 1 sessions.
+      //
+      const uniqueSessionIds = new Set(events.map(ev => ev.command.lsid.id.toString('hex')));
+      const expectedMaxSessions = operations.length - 1;
+      expect(uniqueSessionIds).to.have.length.lessThan(expectedMaxSessions);
     });
   });
 

test/integration/sessions/sessions.prose.test.ts

@@ -11,7 +11,7 @@ events.EventEmitter = class RequireErrorListenerEventEmitter extends EventEmitte
     super(...args);
     const ctorCallSite = new Error('EventEmitter must add an error listener synchronously');
     ctorCallSite.stack;
-    process.nextTick(() => {
+    queueMicrotask(() => {
       const isChangeStream = this.constructor.name
         .toLowerCase()
         .includes('ChangeStream'.toLowerCase());

test/tools/runner/ee_checker.ts

@@ -165,9 +165,9 @@ export const sleep = promisify(setTimeout);
 
 /**
  * If you are using sinon fake timers, it can end up blocking queued IO from running
- * awaiting a nextTick call will allow the event loop to process Networking/FS callbacks
+ * awaiting a setTimeout call will allow the event loop to process Networking/FS callbacks
  */
-export const processTick = () => new Promise(resolve => process.nextTick(resolve));
+export const processTick = () => new Promise(resolve => setTimeout(resolve, 0));
 
 export function getIndicesOfAuthInUrl(connectionString: string | string[]) {
   const doubleSlashIndex = connectionString.indexOf('//');

test/tools/utils.ts

@@ -132,7 +132,7 @@ describe('Polling Srv Records for Mongos Discovery', () => {
       expect(topology.description).to.have.property('type', TopologyType.Sharded);
       const servers = Array.from(topology.description.servers.keys());
       expect(servers).to.deep.equal(srvAddresses(recordSets[0]));
-      process.nextTick(() => srvPoller.trigger(recordSets[1]));
+      queueMicrotask(() => srvPoller.trigger(recordSets[1]));
 
       await once(topology, 'topologyDescriptionChanged');
 
@@ -298,7 +298,7 @@ describe('Polling Srv Records for Mongos Discovery', () => {
         const callback = args[args.length - 1] as (err: null, address: string, family: 4) => void;
 
         if (hostname.includes('test.mock.test.build.10gen.cc')) {
-          return process.nextTick(callback, null, '127.0.0.1', 4);
+          return queueMicrotask(() => callback(null, '127.0.0.1', 4));
         }
 
         const { wrappedMethod: lookup } = lookupStub;