Merge branch 'main' into local-aws

Author: PavelSafronov

.evergreen/config.yml

@@ -1425,7 +1425,8 @@ tasks:
       - func: assume secrets manager role
       - func: run ldap tests
   - name: test-socks5
-    tags: []
+    tags:
+      - socks5
     commands:
       - command: expansions.update
         type: setup
@@ -1451,7 +1452,8 @@ tasks:
       - func: bootstrap mongo-orchestration
       - func: run socks5 tests
   - name: test-socks5-tls
-    tags: []
+    tags:
+      - socks5-tls
     commands:
       - command: expansions.update
         type: setup
@@ -1502,6 +1504,7 @@ tasks:
   - name: test-tls-support-latest
     tags:
       - tls-support
+      - tls-support-latest
     commands:
       - command: expansions.update
         type: setup
@@ -1517,6 +1520,7 @@ tasks:
   - name: test-tls-support-8.0
     tags:
       - tls-support
+      - tls-support-8.0
     commands:
       - command: expansions.update
         type: setup
@@ -1532,6 +1536,7 @@ tasks:
   - name: test-tls-support-7.0
     tags:
       - tls-support
+      - tls-support-7.0
     commands:
       - command: expansions.update
         type: setup
@@ -1547,6 +1552,7 @@ tasks:
   - name: test-tls-support-6.0
     tags:
       - tls-support
+      - tls-support-6.0
     commands:
       - command: expansions.update
         type: setup
@@ -1562,6 +1568,7 @@ tasks:
   - name: test-tls-support-5.0
     tags:
       - tls-support
+      - tls-support-5.0
     commands:
       - command: expansions.update
         type: setup
@@ -1577,6 +1584,7 @@ tasks:
   - name: test-tls-support-4.4
     tags:
       - tls-support
+      - tls-support-4.4
     commands:
       - command: expansions.update
         type: setup
@@ -1592,6 +1600,7 @@ tasks:
   - name: test-tls-support-4.2
     tags:
       - tls-support
+      - tls-support-4.2
     commands:
       - command: expansions.update
         type: setup
@@ -3075,9 +3084,6 @@ buildvariants:
       CLIENT_ENCRYPTION: 'false'
       TEST_CSFLE: 'false'
     tasks:
-      - test-latest-server
-      - test-latest-replica_set
-      - test-latest-sharded_cluster
       - test-rapid-server
       - test-rapid-replica_set
       - test-rapid-sharded_cluster
@@ -3099,12 +3105,6 @@ buildvariants:
       - test-4.2-server
       - test-4.2-replica_set
       - test-4.2-sharded_cluster
-      - test-latest-server-v1-api
-      - test-socks5
-      - test-socks5-tls
-      - test-snappy-compression
-      - test-zstd-compression
-      - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
       - test-tls-support-6.0
@@ -3119,9 +3119,6 @@ buildvariants:
       CLIENT_ENCRYPTION: 'false'
       TEST_CSFLE: 'false'
     tasks:
-      - test-latest-server
-      - test-latest-replica_set
-      - test-latest-sharded_cluster
       - test-rapid-server
       - test-rapid-replica_set
       - test-rapid-sharded_cluster
@@ -3143,12 +3140,6 @@ buildvariants:
       - test-4.2-server
       - test-4.2-replica_set
       - test-4.2-sharded_cluster
-      - test-latest-server-v1-api
-      - test-socks5
-      - test-socks5-tls
-      - test-snappy-compression
-      - test-zstd-compression
-      - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
       - test-tls-support-6.0
@@ -3163,9 +3154,6 @@ buildvariants:
       CLIENT_ENCRYPTION: 'false'
       TEST_CSFLE: 'false'
     tasks:
-      - test-latest-server
-      - test-latest-replica_set
-      - test-latest-sharded_cluster
       - test-rapid-server
       - test-rapid-replica_set
       - test-rapid-sharded_cluster
@@ -3187,12 +3175,6 @@ buildvariants:
       - test-4.2-server
       - test-4.2-replica_set
       - test-4.2-sharded_cluster
-      - test-latest-server-v1-api
-      - test-socks5
-      - test-socks5-tls
-      - test-snappy-compression
-      - test-zstd-compression
-      - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
       - test-tls-support-6.0

.evergreen/generate_evergreen_tasks.js

@@ -45,7 +45,13 @@ const WINDOWS_SKIP_TAGS = new Set([
   'auth',
   'load_balancer',
   'socks5-csfle',
-  'oidc'
+  'oidc',
+
+  // TODO: NODE-7356: enable skipped tests on windows
+  'latest',
+  'socks5',
+  'socks5-tls',
+  'tls-support-latest'
 ]);
 
 const TASKS = [];
@@ -181,7 +187,7 @@ TASKS.push(
     },
     {
       name: 'test-socks5',
-      tags: [],
+      tags: ['socks5'],
       commands: [
         updateExpansions({
           VERSION: 'latest',
@@ -208,7 +214,7 @@ TASKS.push(
     },
     {
       name: 'test-socks5-tls',
-      tags: [],
+      tags: ['socks5-tls'],
       commands: [
         updateExpansions({
           SSL: 'ssl',
@@ -298,7 +304,7 @@ AWS_LAMBDA_HANDLER_TASKS.push({
 for (const VERSION of TLS_VERSIONS) {
   TASKS.push({
     name: `test-tls-support-${VERSION}`,
-    tags: ['tls-support'],
+    tags: ['tls-support', `tls-support-${VERSION}`],
     commands: [
       updateExpansions({
         VERSION,

src/change_stream.ts

@@ -18,6 +18,7 @@ import { MongoClient } from './mongo_client';
 import { type InferIdType, TypedEventEmitter } from './mongo_types';
 import type { AggregateOptions } from './operations/aggregate';
 import type { OperationParent } from './operations/command';
+import { DeprioritizedServers } from './sdam/server_selection';
 import type { ServerSessionId } from './sessions';
 import { CSOTTimeoutContext, type TimeoutContext } from './timeout';
 import { type AnyOptions, getTopology, type MongoDBNamespace, squashError } from './utils';
@@ -1073,7 +1074,8 @@ export class ChangeStream<
     try {
       await topology.selectServer(this.cursor.readPreference, {
         operationName: 'reconnect topology in change stream',
-        timeoutContext: this.timeoutContext
+        timeoutContext: this.timeoutContext,
+        deprioritizedServers: new DeprioritizedServers()
       });
       this.cursor = this._createChangeStreamCursor(this.cursor.resumeOptions);
     } catch {

src/cmap/auth/gssapi.ts

@@ -1,4 +1,5 @@
 import * as dns from 'dns';
+import * as os from 'os';
 
 import { getKerberos, type Kerberos, type KerberosClient } from '../../deps';
 import { MongoInvalidArgumentError, MongoMissingCredentialsError } from '../../error';
@@ -97,7 +98,7 @@ async function makeKerberosClient(authContext: AuthContext): Promise<KerberosCli
   }
 
   const spnHost = mechanismProperties.SERVICE_HOST ?? host;
-  let spn = `${serviceName}${process.platform === 'win32' ? '/' : '@'}${spnHost}`;
+  let spn = `${serviceName}${os.platform() === 'win32' ? '/' : '@'}${spnHost}`;
   if ('SERVICE_REALM' in mechanismProperties) {
     spn = `${spn}@${mechanismProperties.SERVICE_REALM}`;
   }

src/cmap/connect.ts

@@ -35,6 +35,11 @@ import {
 /** @public */
 export type Stream = Socket | TLSSocket;
 
+function applyBackpressureLabels(error: MongoError) {
+  error.addErrorLabel(MongoErrorLabel.SystemOverloadedError);
+  error.addErrorLabel(MongoErrorLabel.RetryableError);
+}
+
 export async function connect(options: ConnectionOptions): Promise<Connection> {
   let connection: Connection | null = null;
   try {
@@ -103,6 +108,8 @@ export async function performInitialHandshake(
   const authContext = new AuthContext(conn, credentials, options);
   conn.authContext = authContext;
 
+  // If we encounter an error preparing the handshake document, do NOT apply backpressure labels.  Errors
+  // encountered building the handshake document are all client-side, and do not indicate an overloaded server.
   const handshakeDoc = await prepareHandshakeDocument(authContext);
 
   // @ts-expect-error: TODO(NODE-5141): The options need to be filtered properly, Connection options differ from Command options
@@ -163,12 +170,15 @@ export async function performInitialHandshake(
     try {
       await provider.auth(authContext);
     } catch (error) {
+      // NOTE: If we encounter an error authenticating a connection, do NOT apply backpressure labels.
+
       if (error instanceof MongoError) {
         error.addErrorLabel(MongoErrorLabel.HandshakeError);
         if (needsRetryableWriteLabel(error, response.maxWireVersion, conn.description.type)) {
           error.addErrorLabel(MongoErrorLabel.RetryableWriteError);
         }
       }
+
       throw error;
     }
   }
@@ -189,6 +199,11 @@ export async function performInitialHandshake(
       if (error instanceof MongoError) {
         error.addErrorLabel(MongoErrorLabel.HandshakeError);
       }
+      // If we encounter a network error executing the initial handshake, apply backpressure labels.
+      if (error instanceof MongoNetworkError) {
+        applyBackpressureLabels(error);
+      }
+
       throw error;
     }
   }
@@ -424,6 +439,10 @@ export async function makeSocket(options: MakeConnectionOptions): Promise<Stream
     socket = await connectedSocket;
     return socket;
   } catch (error) {
+    // If we encounter an error while establishing a socket, apply the backpressure labels to it.  We cannot
+    // differentiate between DNS, TLS errors and network errors without refactoring our connection establishment to
+    // handle all three steps separately.
+    applyBackpressureLabels(error);
     socket.destroy();
     throw error;
   } finally {

src/cmap/connection_pool.ts

@@ -231,7 +231,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));
     });
   }
@@ -342,7 +342,7 @@ export class ConnectionPool extends TypedEventEmitter<ConnectionPoolEvents> {
     });
 
     this.waitQueue.push(waitQueueMember);
-    process.nextTick(() => this.processWaitQueue());
+    queueMicrotask(() => this.processWaitQueue());
 
     try {
       timeout?.throwIfExpired();
@@ -405,7 +405,7 @@ export class ConnectionPool extends TypedEventEmitter<ConnectionPoolEvents> {
       this.destroyConnection(connection, reason);
     }
 
-    process.nextTick(() => this.processWaitQueue());
+    queueMicrotask(() => this.processWaitQueue());
   }
 
   /**
@@ -461,7 +461,7 @@ export class ConnectionPool extends TypedEventEmitter<ConnectionPoolEvents> {
     }
 
     if (interruptInUseConnections) {
-      process.nextTick(() => this.interruptInUseConnections(oldGeneration));
+      queueMicrotask(() => this.interruptInUseConnections(oldGeneration));
     }
 
     this.processWaitQueue();
@@ -702,7 +702,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);
@@ -809,7 +809,7 @@ export class ConnectionPool extends TypedEventEmitter<ConnectionPoolEvents> {
             waitQueueMember.resolve(connection);
           }
         }
-        process.nextTick(() => this.processWaitQueue());
+        queueMicrotask(() => this.processWaitQueue());
       });
     }
     this.processingWaitQueue = false;

src/cmap/handshake/client_metadata.ts

@@ -157,8 +157,8 @@ export async function makeClientMetadata(
 
   // Note: order matters, os.type is last so it will be removed last if we're at maxSize
   const osInfo = new Map()
-    .set('name', process.platform)
-    .set('architecture', process.arch)
+    .set('name', os.platform())
+    .set('architecture', os.arch())
     .set('version', os.release())
     .set('type', os.type());
 

src/error.ts

@@ -99,7 +99,9 @@ export const MongoErrorLabel = Object.freeze({
   ResetPool: 'ResetPool',
   PoolRequestedRetry: 'PoolRequestedRetry',
   InterruptInUseConnections: 'InterruptInUseConnections',
-  NoWritesPerformed: 'NoWritesPerformed'
+  NoWritesPerformed: 'NoWritesPerformed',
+  RetryableError: 'RetryableError',
+  SystemOverloadedError: 'SystemOverloadedError'
 } as const);
 
 /** @public */