From 70810d191c625447eb2d5324f627c36009a762a7 Mon Sep 17 00:00:00 2001
From: Neal Beeken <neal.beeken@mongodb.com>
Date: Thu, 8 Jul 2021 14:16:16 -0400
Subject: [PATCH] fix(NODE-1843): bulk operations ignoring provided sessions
 (#2868)

---
 src/bulk/common.ts           |   3 +-
 test/functional/bulk.test.js | 142 +++++++++++++++++++++++++++++++++++
 2 files changed, 144 insertions(+), 1 deletion(-)

diff --git a/src/bulk/common.ts b/src/bulk/common.ts
index 79a24cd581..290cbd4e36 100644
--- a/src/bulk/common.ts
+++ b/src/bulk/common.ts
@@ -1203,7 +1203,8 @@ export abstract class BulkOperationBase {
     }
 
     this.s.executed = true;
-    return executeLegacyOperation(this.s.topology, executeCommands, [this, options, callback]);
+    const finalOptions = { ...this.s.options, ...options };
+    return executeLegacyOperation(this.s.topology, executeCommands, [this, finalOptions, callback]);
   }
 
   /**
diff --git a/test/functional/bulk.test.js b/test/functional/bulk.test.js
index 9c69ee0ef0..61d1cca369 100644
--- a/test/functional/bulk.test.js
+++ b/test/functional/bulk.test.js
@@ -2003,4 +2003,146 @@ describe('Bulk', function () {
         );
     });
   });
+
+  describe('Bulk operation transaction rollback', () => {
+    /** @type {import('../../src/index').MongoClient} */
+    let client;
+    /** @type {import('../../src/index').Collection<{ answer: number }>} */
+    let collection;
+
+    beforeEach(async function () {
+      const config = this.configuration;
+      client = config.newClient();
+      await client.connect();
+
+      try {
+        await client
+          .db('bulk_operation_writes_test')
+          .collection('bulk_write_transaction_test')
+          .drop();
+      } catch (_) {
+        // do not care
+      }
+
+      collection = await client
+        .db('bulk_operation_writes_test')
+        .createCollection('bulk_write_transaction_test');
+
+      await collection.deleteMany({});
+    });
+
+    afterEach(async () => {
+      if (client) await client.close();
+    });
+
+    it('should abort ordered bulk operation writes', {
+      metadata: { requires: { mongodb: '>= 4.2', topology: ['replicaset'] } },
+      async test() {
+        const session = client.startSession();
+        session.startTransaction({
+          readConcern: { level: 'local' },
+          writeConcern: { w: 'majority' }
+        });
+
+        let bulk = undefined;
+
+        bulk = collection.initializeOrderedBulkOp({ session });
+        bulk.insert({ answer: 42 });
+        await bulk.execute();
+
+        await session.abortTransaction();
+        await session.endSession();
+
+        const documents = await collection.find().toArray();
+
+        expect(documents).to.have.lengthOf(
+          0,
+          'bulk operation writes were made outside of transaction'
+        );
+      }
+    });
+
+    it('should abort unordered bulk operation writes', {
+      metadata: { requires: { mongodb: '>= 4.2', topology: ['replicaset'] } },
+      async test() {
+        const session = client.startSession();
+        session.startTransaction({
+          readConcern: { level: 'local' },
+          writeConcern: { w: 'majority' }
+        });
+
+        let bulk = undefined;
+
+        bulk = collection.initializeUnorderedBulkOp({ session });
+        bulk.insert({ answer: 42 });
+        await bulk.execute();
+
+        await session.abortTransaction();
+        await session.endSession();
+
+        const documents = await collection.find().toArray();
+
+        expect(documents).to.have.lengthOf(
+          0,
+          'bulk operation writes were made outside of transaction'
+        );
+      }
+    });
+
+    it('should abort unordered bulk operation writes using withTransaction', {
+      metadata: { requires: { mongodb: '>= 4.2', topology: ['replicaset'] } },
+      async test() {
+        const session = client.startSession();
+
+        await session.withTransaction(
+          async () => {
+            let bulk = undefined;
+
+            bulk = collection.initializeUnorderedBulkOp({ session });
+            bulk.insert({ answer: 42 });
+            await bulk.execute();
+            await session.abortTransaction();
+          },
+          { readConcern: { level: 'local' }, writeConcern: { w: 'majority' } }
+        );
+
+        await session.endSession();
+
+        const documents = await collection.find().toArray();
+
+        expect(documents).to.have.lengthOf(
+          0,
+          'bulk operation writes were made outside of transaction'
+        );
+      }
+    });
+
+    it('should abort ordered bulk operation writes using withTransaction', {
+      metadata: { requires: { mongodb: '>= 4.2', topology: ['replicaset'] } },
+      async test() {
+        const session = client.startSession();
+
+        await session.withTransaction(
+          async () => {
+            let bulk = undefined;
+
+            bulk = collection.initializeOrderedBulkOp({ session });
+            bulk.insert({ answer: 42 });
+            await bulk.execute();
+            await session.abortTransaction();
+          },
+          { readConcern: { level: 'local' }, writeConcern: { w: 'majority' } }
+        );
+
+        await session.endSession();
+
+        const documents = await collection.find().toArray();
+
+        expect(documents).to.have.lengthOf(
+          0,
+          'bulk operation writes were made outside of transaction'
+        );
+      }
+    });
+  });
 });