refactor(NODE-3845): update load balancer config (#3089)

mongodb · Feb 2, 2022 · 6970871 · 6970871
1 parent c63a21b
commit 6970871
Show file tree

Hide file tree

Showing 12 changed files with 77 additions and 49 deletions.
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -82,6 +82,7 @@ functions:
           AUTH=${AUTH} SSL=${SSL} \
           ORCHESTRATION_FILE=${ORCHESTRATION_FILE} \
           REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \
+          LOAD_BALANCER=${LOAD_BALANCER} \
           bash ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
     - command: expansions.update
       params:
@@ -201,7 +202,7 @@ functions:
           TOPOLOGY="${TOPOLOGY}" \
           SKIP_DEPS=${SKIP_DEPS|1} \
           NO_EXIT=${NO_EXIT|1} \
-          FAKE_MONGODB_SERVICE_ID="true" \
+          LOAD_BALANCER="${LOAD_BALANCER}" \
             bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
   run checks:
     - command: shell.exec
@@ -972,8 +973,9 @@ tasks:
       - func: install dependencies
       - func: bootstrap mongo-orchestration
         vars:
-          VERSION: '5.0'
+          VERSION: latest
           TOPOLOGY: sharded_cluster
+          LOAD_BALANCER: 'true'
       - func: start-load-balancer
       - func: run-lb-tests
       - func: stop-load-balancer

diff --git a/.evergreen/config.yml.in b/.evergreen/config.yml.in
@@ -99,6 +99,7 @@ functions:
           AUTH=${AUTH} SSL=${SSL} \
           ORCHESTRATION_FILE=${ORCHESTRATION_FILE} \
           REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \
+          LOAD_BALANCER=${LOAD_BALANCER} \
           bash ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
     # run-orchestration generates expansion file with the MONGODB_URI for the cluster
     - command: expansions.update
@@ -225,7 +226,7 @@ functions:
           TOPOLOGY="${TOPOLOGY}" \
           SKIP_DEPS=${SKIP_DEPS|1} \
           NO_EXIT=${NO_EXIT|1} \
-          FAKE_MONGODB_SERVICE_ID="true" \
+          LOAD_BALANCER="${LOAD_BALANCER}" \
             bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
 
   "run checks":

diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js
@@ -117,8 +117,9 @@ TASKS.push(
         {
           func: 'bootstrap mongo-orchestration',
           vars: {
-            VERSION: '5.0',
-            TOPOLOGY: 'sharded_cluster'
+            VERSION: 'latest',
+            TOPOLOGY: 'sharded_cluster',
+            LOAD_BALANCER: 'true'
           }
         },
         { func: 'start-load-balancer' },

diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
@@ -50,4 +50,4 @@ else
   . $DRIVERS_TOOLS/.evergreen/csfle/set-temp-creds.sh
 fi
 
-SINGLE_MONGOS_LB_URI=${SINGLE_MONGOS_LB_URI} MULTI_MONGOS_LB_URI=${MULTI_MONGOS_LB_URI} MONGODB_API_VERSION=${MONGODB_API_VERSION} MONGODB_UNIFIED_TOPOLOGY=${UNIFIED} MONGODB_URI=${MONGODB_URI} npm run ${TEST_NPM_SCRIPT}
+SINGLE_MONGOS_LB_URI=${SINGLE_MONGOS_LB_URI} MULTI_MONGOS_LB_URI=${MULTI_MONGOS_LB_URI} MONGODB_API_VERSION=${MONGODB_API_VERSION} MONGODB_UNIFIED_TOPOLOGY=${UNIFIED} MONGODB_URI=${MONGODB_URI} LOAD_BALANCER=${LOAD_BALANCER} npm run ${TEST_NPM_SCRIPT}
diff --git a/global.d.ts b/global.d.ts
@@ -1,11 +1,13 @@
 import type { TestConfiguration } from './test/tools/unified-spec-runner/runner';
 
+type WithExclusion<T extends string> = `!${T}`
 /** Defined in test/tools/runner/filters/mongodb_topology_filter.js (topologyTypeToString) */
 type TopologyTypes = 'single' | 'replicaset' | 'sharded' | 'load-balanced';
+type TopologyTypeRequirement = WithExclusion<TopologyTypes> | WithExclusion<TopologyTypes>[]
 
 interface MongoDBMetadataUI {
   requires?: {
-    topology?: TopologyTypes | TopologyTypes[];
+    topology?: TopologyTypeRequirement;
     mongodb?: string;
     os?: NodeJS.Platform | `!${NodeJS.Platform}`;
     apiVersion?: '1';
@@ -58,7 +60,7 @@ declare global {
        * - my test
        *   - TODO(NODE-XXXX): Feature implementation impending!
        * ```
-       * 
+       *
        * You can also skip a set of tests via beforeEach:
        * ```
        * beforeEach(() => {

diff --git a/src/cmap/connect.ts b/src/cmap/connect.ts
@@ -50,10 +50,6 @@ const AUTH_PROVIDERS = new Map<AuthMechanism | string, AuthProvider>([
   [AuthMechanism.MONGODB_X509, new X509()]
 ]);
 
-const FAKE_MONGODB_SERVICE_ID =
-  typeof process.env.FAKE_MONGODB_SERVICE_ID === 'string' &&
-  process.env.FAKE_MONGODB_SERVICE_ID.toLowerCase() === 'true';
-
 /** @public */
 export type Stream = Socket | TLSSocket;
 
@@ -163,10 +159,6 @@ function performInitialHandshake(
       }
 
       if (options.loadBalanced) {
-        // TODO: Durran: Remove when server support exists. (NODE-3431)
-        if (FAKE_MONGODB_SERVICE_ID) {
-          response.serviceId = response.topologyVersion.processId;
-        }
         if (!response.serviceId) {
           return callback(
             new MongoCompatibilityError(

diff --git a/test/integration/connection-monitoring-and-pooling/connection.test.js b/test/integration/connection-monitoring-and-pooling/connection.test.js
@@ -16,7 +16,7 @@ describe('Connection', function () {
 
   describe('Connection - functional/cmap', function () {
     it('should execute a command against a server', {
-      metadata: { requires: { apiVersion: false } },
+      metadata: { requires: { apiVersion: false, topology: '!load-balanced' } },
       test: function (done) {
         const connectOptions = Object.assign(
           { connectionType: Connection },
@@ -38,7 +38,7 @@ describe('Connection', function () {
     });
 
     it('should emit command monitoring events', {
-      metadata: { requires: { apiVersion: false } },
+      metadata: { requires: { apiVersion: false, topology: '!load-balanced' } },
       test: function (done) {
         const connectOptions = Object.assign(
           { connectionType: Connection, monitorCommands: true },

diff --git a/test/integration/node-specific/topology.test.js b/test/integration/node-specific/topology.test.js
@@ -3,7 +3,7 @@ const { expect } = require('chai');
 
 describe('Topology', function () {
   it('should correctly track states of a topology', {
-    metadata: { requires: { apiVersion: false } }, // apiVersion not supported by newTopology()
+    metadata: { requires: { apiVersion: false, topology: '!load-balanced' } }, // apiVersion not supported by newTopology()
     test: function (done) {
       const topology = this.configuration.newTopology();
 

diff --git a/test/tools/runner/filters/mongodb_topology_filter.js b/test/tools/runner/filters/mongodb_topology_filter.js
@@ -40,7 +40,25 @@ class MongoDBTopologyFilter {
       );
     }
 
-    return topologies.some(topology => topology === this.runtimeTopology);
+    const isExclusion = topologies[0][0] === '!';
+    if (isExclusion) {
+      if (!topologies.every(topology => topology.startsWith('!'))) {
+        // Not every topology starts with !
+        throw new Error('Cannot combine inclusion with exclusion of topologies');
+      }
+
+      // Every excluded topology does not equal the current (prefix !)
+      return topologies.every(topology => topology !== `!${this.runtimeTopology}`);
+    } else {
+      // inclusion list
+      if (topologies.some(topology => topology.startsWith('!'))) {
+        // Some topologies start with !
+        throw new Error('Cannot combine exclusion with inclusion of topologies');
+      }
+
+      // At least some (one) of the included topologies equals the current
+      return topologies.some(topology => topology === this.runtimeTopology);
+    }
   }
 }
 

diff --git a/test/tools/runner/index.js b/test/tools/runner/index.js
@@ -93,7 +93,10 @@ before(async function () {
     context.multiMongosLoadBalancerUri = MULTI_MONGOS_LB_URI;
   }
 
-  this.configuration = new TestConfiguration(MONGODB_URI, context);
+  this.configuration = new TestConfiguration(
+    loadBalanced ? SINGLE_MONGOS_LB_URI : MONGODB_URI,
+    context
+  );
   await client.close();
 });
 

diff --git a/test/tools/unified-spec-runner/entities.ts b/test/tools/unified-spec-runner/entities.ts
@@ -204,7 +204,9 @@ export class FailPointMap extends Map<string, Document> {
     const entries = Array.from(this.entries());
     await Promise.all(
       entries.map(async ([hostAddress, configureFailPoint]) => {
-        if (process.env.SERVERLESS) hostAddress += '?loadBalanced=true';
+        if (process.env.SERVERLESS || process.env.LOAD_BALANCER) {
+          hostAddress += '?loadBalanced=true';
+        }
         const client = getClient(hostAddress);
         try {
           await client.connect();

diff --git a/test/unit/sdam/topology.test.js b/test/unit/sdam/topology.test.js
@@ -458,37 +458,44 @@ describe('Topology (unit)', function () {
       this.sinon.restore();
     });
 
-    it('should schedule monitoring if no suitable server is found', function (done) {
-      const topology = new Topology('someserver:27019');
-      const requestCheck = this.sinon.stub(Server.prototype, 'requestCheck');
-
-      // satisfy the initial connect, then restore the original method
-      const selectServer = this.sinon
-        .stub(Topology.prototype, 'selectServer')
-        .callsFake(function (selector, options, callback) {
-          const server = Array.from(this.s.servers.values())[0];
-          selectServer.restore();
-          callback(null, server);
-        });
-
-      this.sinon.stub(Server.prototype, 'connect').callsFake(function () {
-        this.s.state = 'connected';
-        this.emit('connect');
-      });
+    it('should schedule monitoring if no suitable server is found', {
+      metadata: { requires: { topology: '!load-balanced' } },
+      test: function (done) {
+        const topology = new Topology('someserver:27019');
+        const requestCheck = this.sinon.stub(Server.prototype, 'requestCheck');
 
-      topology.connect(() => {
-        topology.selectServer(ReadPreference.secondary, { serverSelectionTimeoutMS: 1000 }, err => {
-          expect(err).to.exist;
-          expect(err).to.match(/Server selection timed out/);
-          expect(err).to.have.property('reason');
+        // satisfy the initial connect, then restore the original method
+        const selectServer = this.sinon
+          .stub(Topology.prototype, 'selectServer')
+          .callsFake(function (selector, options, callback) {
+            const server = Array.from(this.s.servers.values())[0];
+            selectServer.restore();
+            callback(null, server);
+          });
 
-          // When server is created `connect` is called on the monitor. When server selection
-          // occurs `requestCheck` will be called for an immediate check.
-          expect(requestCheck).property('callCount').to.equal(1);
+        this.sinon.stub(Server.prototype, 'connect').callsFake(function () {
+          this.s.state = 'connected';
+          this.emit('connect');
+        });
 
-          topology.close(done);
+        topology.connect(() => {
+          topology.selectServer(
+            ReadPreference.secondary,
+            { serverSelectionTimeoutMS: 1000 },
+            err => {
+              expect(err).to.exist;
+              expect(err).to.match(/Server selection timed out/);
+              expect(err).to.have.property('reason');
+
+              // When server is created `connect` is called on the monitor. When server selection
+              // occurs `requestCheck` will be called for an immediate check.
+              expect(requestCheck).property('callCount').to.equal(1);
+
+              topology.close(done);
+            }
+          );
         });
-      });
+      }
     });
 
     it('should disallow selection when the topology is explicitly closed', function (done) {