clean up

clean up 2

clean up 2

clean up

Author: aditi-khare-mongoDB

test/integration/node-specific/client_close.test.ts

@@ -15,7 +15,7 @@ describe('MongoClient.close() Integration', () => {
 
   describe('Node.js resource: TLS File read', () => {
     describe('when client is connecting and reads an infinite TLS file', () => {
-      it('the file read is interrupted by client.close()', async function () {
+      it.skip('the file read is interrupted by client.close()', async function () {
         await runScriptAndGetProcessInfo(
           'tls-file-read',
           config,
@@ -51,7 +51,7 @@ describe('MongoClient.close() Integration', () => {
       });
 
       describe('when MongoClientAuthProviders is instantiated and token file read hangs', () => {
-        it('the file read is interrupted by client.close()', async () => {
+        it.skip('the file read is interrupted by client.close()', async () => {
           await runScriptAndGetProcessInfo(
             'token-file-read',
             config,
@@ -78,8 +78,7 @@ describe('MongoClient.close() Integration', () => {
     describe('Node.js resource: Server Selection Timer', () => {
       describe('after a Topology is created through client.connect()', () => {
         const metadata: MongoDBMetadataUI = { requires: { topology: 'replicaset' } };
-
-        it('server selection timers are cleaned up by client.close()', metadata, async () => {
+        it.skip('server selection timers are cleaned up by client.close()', metadata, async () => {
           const run = async function ({ MongoClient, uri, expect, sleep, mongodb, getTimerCount }) {
             const serverSelectionTimeoutMS = 2222;
             const client = new MongoClient(uri, {
@@ -118,7 +117,7 @@ describe('MongoClient.close() Integration', () => {
         describe('MonitorInterval', () => {
           describe('Node.js resource: Timer', () => {
             describe('after a new monitor is made', () => {
-              it(
+              it.skip(
                 'monitor interval timer is cleaned up by client.close()',
                 metadata,
                 async function () {
@@ -151,7 +150,7 @@ describe('MongoClient.close() Integration', () => {
             });
 
             describe('after a heartbeat fails', () => {
-              it(
+              it.skip(
                 'the new monitor interval timer is cleaned up by client.close()',
                 metadata,
                 async () => {
@@ -161,7 +160,6 @@ describe('MongoClient.close() Integration', () => {
                     const willBeHeartbeatFailed = once(client, 'serverHeartbeatFailed');
                     client.connect();
                     await willBeHeartbeatFailed;
-
                     function getMonitorTimer(servers) {
                       for (const [, server] of servers) {
                         return server?.monitor.monitorId.timerId;
@@ -184,7 +182,7 @@ describe('MongoClient.close() Integration', () => {
 
         describe('Monitoring Connection', () => {
           describe('Node.js resource: Socket', () => {
-            it('no sockets remain after client.close()', metadata, async function () {
+            it.skip('no sockets remain after client.close()', metadata, async function () {
               const run = async function ({ MongoClient, uri, expect, getSocketEndpoints }) {
                 const client = new MongoClient(uri);
                 await client.connect();
@@ -212,7 +210,7 @@ describe('MongoClient.close() Integration', () => {
         describe('RTT Pinger', () => {
           describe('Node.js resource: Timer', () => {
             describe('after entering monitor streaming mode ', () => {
-              it(
+              it.skip(
                 'the rtt pinger timer is cleaned up by client.close()',
                 metadata,
                 async function () {
@@ -248,8 +246,8 @@ describe('MongoClient.close() Integration', () => {
           describe('Connection', () => {
             describe('Node.js resource: Socket', () => {
               describe('when rtt monitoring is turned on', () => {
-                it('no sockets remain after client.close()', metadata, async () => {
-                  const run = async ({ MongoClient, uri, expect, getSockets, once, log }) => {
+                it.skip('no sockets remain after client.close()', metadata, async () => {
+                  const run = async ({ MongoClient, uri, expect, getSockets, once }) => {
                     const heartbeatFrequencyMS = 500;
                     const client = new MongoClient(uri, {
                       serverMonitoringMode: 'stream',
@@ -266,7 +264,6 @@ describe('MongoClient.close() Integration', () => {
 
                     while (heartbeatOccurredSet.size < servers.size) {
                       const ev = await once(client, 'serverHeartbeatSucceeded');
-                      log({ ev: ev[0] });
                       heartbeatOccurredSet.add(ev[0].connectionId);
                     }
 
@@ -282,8 +279,6 @@ describe('MongoClient.close() Integration', () => {
 
                     // close the client
                     await client.close();
-
-                    log({ socketsAfterClose: getSockets() });
                     // upon close, assert rttPinger sockets are cleaned up
                     const activeSocketsAfterClose = activeSocketsAfterHeartbeat();
                     expect(activeSocketsAfterClose).to.have.lengthOf(0);
@@ -300,7 +295,7 @@ describe('MongoClient.close() Integration', () => {
       describe('ConnectionPool', () => {
         describe('Node.js resource: minPoolSize timer', () => {
           describe('after new connection pool is created', () => {
-            it('the minPoolSize timer is cleaned up by client.close()', async function () {
+            it.skip('the minPoolSize timer is cleaned up by client.close()', async function () {
               const run = async function ({ MongoClient, uri, expect, getTimerCount }) {
                 const client = new MongoClient(uri, { minPoolSize: 1 });
                 let minPoolSizeTimerCreated = false;
@@ -358,7 +353,7 @@ describe('MongoClient.close() Integration', () => {
               await utilClient.close();
             });
 
-            it('the wait queue timer is cleaned up by client.close()', async function () {
+            it.skip('the wait queue timer is cleaned up by client.close()', async function () {
               const run = async function ({ MongoClient, uri, expect, getTimerCount, once }) {
                 const waitQueueTimeoutMS = 1515;
 
@@ -400,7 +395,7 @@ describe('MongoClient.close() Integration', () => {
         describe('Connection', () => {
           describe('Node.js resource: Socket', () => {
             describe('after a minPoolSize has been set on the ConnectionPool', () => {
-              it('no sockets remain after client.close()', async function () {
+              it.skip('no sockets remain after client.close()', async function () {
                 const run = async function ({ MongoClient, uri, expect, getSockets }) {
                   // assert no sockets to start with
                   expect(getSockets()).to.have.lengthOf(0);
@@ -432,7 +427,7 @@ describe('MongoClient.close() Integration', () => {
         const metadata: MongoDBMetadataUI = { requires: { topology: 'sharded' } };
 
         describe('after SRVPoller is created', () => {
-          it('timers are cleaned up by client.close()', metadata, async () => {
+          it.skip('timers are cleaned up by client.close()', metadata, async () => {
             const run = async function ({ MongoClient, expect, getTimerCount }) {
               const SRV_CONNECTION_STRING = `mongodb+srv://test1.test.build.10gen.cc`;
               // 27018 localhost.test.build.10gen.cc.
@@ -456,83 +451,119 @@ describe('MongoClient.close() Integration', () => {
   describe('ClientSession (Implicit)', () => {
     let idleSessionsBeforeClose;
     let idleSessionsAfterClose;
+    let client;
+    let utilClient;
+    let session;
+
+    const metadata: MongoDBMetadataUI = { requires: { topology: ['replicaset', 'sharded'] } };
 
     beforeEach(async function () {
-      const client = this.configuration.newClient();
+      client = this.configuration.newClient();
+      utilClient = this.configuration.newClient();
       await client.connect();
-      const session = client.startSession({ explicit: false });
+      session = client.startSession({ explicit: false });
       session.startTransaction();
       await client.db('db').collection('collection').insertOne({ x: 1 }, { session });
 
-      const opBefore = await client.db().admin().command({ currentOp: 1 });
+      const opBefore = await utilClient.db().admin().command({ currentOp: 1 });
       idleSessionsBeforeClose = opBefore.inprog.filter(s => s.type === 'idleSession');
 
       await client.close();
-      await client.connect();
 
-      const opAfter = await client.db().admin().command({ currentOp: 1 });
+      const opAfter = await utilClient.db().admin().command({ currentOp: 1 });
       idleSessionsAfterClose = opAfter.inprog.filter(s => s.type === 'idleSession');
 
-      await client.close();
+      await utilClient.close();
+    });
+
+    afterEach(async function () {
+      await utilClient?.close();
+      await session?.endSession();
+      await client?.close();
     });
 
     describe('Server resource: LSID/ServerSession', () => {
       describe('after a clientSession is implicitly created and used', () => {
-        it('the server-side ServerSession is cleaned up by client.close()', async function () {
-          expect(idleSessionsBeforeClose).to.not.be.empty;
-          expect(idleSessionsAfterClose).to.be.empty;
-        });
+        it(
+          'the server-side ServerSession is cleaned up by client.close()',
+          metadata,
+          async function () {
+            expect(idleSessionsBeforeClose).to.not.be.empty;
+            expect(idleSessionsAfterClose).to.be.empty;
+          }
+        );
       });
     });
 
     describe('Server resource: Transactions', () => {
       describe('after a clientSession is implicitly created and used', () => {
-        it('the server-side transaction is cleaned up by client.close()', async function () {
-          expect(idleSessionsBeforeClose[0].transaction.txnNumber).to.not.null;
-          expect(idleSessionsAfterClose).to.be.empty;
-        });
+        it(
+          'the server-side transaction is cleaned up by client.close()',
+          metadata,
+          async function () {
+            expect(idleSessionsBeforeClose[0].transaction.txnNumber).to.not.null;
+            expect(idleSessionsAfterClose).to.be.empty;
+          }
+        );
       });
     });
   });
 
   describe('ClientSession (Explicit)', () => {
     let idleSessionsBeforeClose;
     let idleSessionsAfterClose;
+    let client;
+    let utilClient;
+    let session;
+
+    const metadata: MongoDBMetadataUI = { requires: { topology: ['replicaset', 'sharded'] } };
 
     beforeEach(async function () {
-      const client = this.configuration.newClient();
+      client = this.configuration.newClient();
+      utilClient = this.configuration.newClient();
       await client.connect();
-      const session = client.startSession();
+      session = client.startSession();
       session.startTransaction();
       await client.db('db').collection('collection').insertOne({ x: 1 }, { session });
 
-      const opBefore = await client.db().admin().command({ currentOp: 1 });
+      const opBefore = await utilClient.db().admin().command({ currentOp: 1 });
       idleSessionsBeforeClose = opBefore.inprog.filter(s => s.type === 'idleSession');
 
       await client.close();
-      await client.connect();
 
-      const opAfter = await client.db().admin().command({ currentOp: 1 });
+      const opAfter = await utilClient.db().admin().command({ currentOp: 1 });
       idleSessionsAfterClose = opAfter.inprog.filter(s => s.type === 'idleSession');
+    });
 
-      await client.close();
+    afterEach(async function () {
+      await utilClient?.close();
+      await session?.endSession();
+      await client?.close();
     });
 
     describe('Server resource: LSID/ServerSession', () => {
       describe('after a clientSession is created and used', () => {
-        it('the server-side ServerSession is cleaned up by client.close()', async function () {
-          expect(idleSessionsBeforeClose).to.not.be.empty;
-          expect(idleSessionsAfterClose).to.be.empty;
-        });
+        it(
+          'the server-side ServerSession is cleaned up by client.close()',
+          metadata,
+          async function () {
+            expect(idleSessionsBeforeClose).to.not.be.empty;
+            expect(idleSessionsAfterClose).to.be.empty;
+          }
+        );
       });
     });
 
     describe('Server resource: Transactions', () => {
       describe('after a clientSession is created and used', () => {
-        it('the server-side transaction is cleaned up by client.close()', async function () {
-          expect(idleSessionsBeforeClose[0].transaction.txnNumber).to.not.null;
-          expect(idleSessionsAfterClose).to.be.empty;
-        });
+        it(
+          'the server-side transaction is cleaned up by client.close()',
+          metadata,
+          async function () {
+            expect(idleSessionsBeforeClose[0].transaction.txnNumber).to.not.null;
+            expect(idleSessionsAfterClose).to.be.empty;
+          }
+        );
       });
     });
   });
@@ -548,7 +579,7 @@ describe('MongoClient.close() Integration', () => {
     describe('KMS Request', () => {
       describe('Node.js resource: TLS file read', () => {
         describe('when KMSRequest reads an infinite TLS file', () => {
-          it('the file read is interrupted by client.close()', metadata, async () => {
+          it.skip('the file read is interrupted by client.close()', metadata, async () => {
             await runScriptAndGetProcessInfo(
               'tls-file-read-auto-encryption',
               config,
@@ -645,20 +676,24 @@ describe('MongoClient.close() Integration', () => {
       let client;
       let coll;
       let cursor;
+      let utilClient;
 
       beforeEach(async function () {
         client = this.configuration.newClient();
+        utilClient = this.configuration.newClient();
+        await client.connect();
         coll = client.db('db').collection('coll');
       });
 
       afterEach(async function () {
+        await utilClient?.close();
         await client?.close();
         await cursor?.close();
       });
 
-      it('all active server-side cursors are closed by client.close()', async function () {
+      it.skip('all active server-side cursors are closed by client.close()', async function () {
         const getCursors = async () => {
-          const res = await client
+          const res = await utilClient
             .db()
             .admin()
             .command({
@@ -672,17 +707,18 @@ describe('MongoClient.close() Integration', () => {
         };
 
         await coll.insertMany([{ a: 1 }, { b: 2 }, { c: 3 }]);
+        await coll.insertMany([{ d: 4 }, { e: 5 }, { f: 3 }]);
         cursor = await coll.find();
+        await cursor.next();
 
         // assert creation
         expect(await getCursors()).to.not.be.empty;
 
         await client.close();
-        await client.connect();
 
         // assert clean-up
         expect(await getCursors()).to.be.empty;
       });
     });
   });
-});
+});

test/integration/node-specific/resource_tracking_script_builder.ts

@@ -58,9 +58,7 @@ export async function testScriptFactory(
   resourceScript = resourceScript.replace('FUNCTION_STRING', `(${func.toString()})`);
   resourceScript = resourceScript.replace('SCRIPT_NAME_STRING', JSON.stringify(name));
   resourceScript = resourceScript.replace('URI_STRING', JSON.stringify(uri));
-  if (resourceScriptPath === HEAP_RESOURCE_SCRIPT_PATH) {
-    resourceScript = resourceScript.replace('ITERATIONS_STRING', `${iterations}`);
-  }
+  resourceScript = resourceScript.replace('ITERATIONS_STRING', `${iterations}`);
 
   return resourceScript;
 }