SERVER-35160 ScopedThreads should automatically inherit TestData from their parent thread

2 files changed, 3 insertions, 10 deletions

diff --git a/jstests/concurrency/fsm_libs/thread_mgr.js b/jstests/concurrency/fsm_libs/thread_mgr.js
index a6e361f1103..29ac7cd38f6 100644
--- a/jstests/concurrency/fsm_libs/thread_mgr.js
+++ b/jstests/concurrency/fsm_libs/thread_mgr.js
@@ -121,8 +121,7 @@ var ThreadManager = function(clusterOptions, executionMode = {composed: false})
                     seed: Random.randInt(1e13),  // contains range of Date.getTime()
                     globalAssertLevel: globalAssertLevel,
                     errorLatch: errorLatch,
-                    sessionOptions: options.sessionOptions,
-                    testData: TestData
+                    sessionOptions: options.sessionOptions
                 };
 
                 var t = makeThread(workloads, args, options);
diff --git a/jstests/concurrency/fsm_libs/worker_thread.js b/jstests/concurrency/fsm_libs/worker_thread.js
index 8b1ea3be492..8f331f362f0 100644
--- a/jstests/concurrency/fsm_libs/worker_thread.js
+++ b/jstests/concurrency/fsm_libs/worker_thread.js
@@ -20,7 +20,6 @@ var workerThread = (function() {
     // args.globalAssertLevel = the global assertion level to use
     // args.errorLatch = CountDownLatch instance that threads count down when they error
     // args.sessionOptions = the options to start a session with
-    // args.testData = TestData object
     // run = callback that takes a map of workloads to their associated $config
     function main(workloads, args, run) {
         var myDB;
@@ -32,11 +31,6 @@ var workerThread = (function() {
 
         globalAssertLevel = args.globalAssertLevel;
 
-        // The global 'TestData' object may still be undefined if the concurrency suite isn't being
-        // run by resmoke.py (e.g. if it is being run via a parallel shell in the backup/restore
-        // tests).
-        TestData = (args.testData !== undefined) ? args.testData : {};
-
         try {
             if (typeof db !== 'undefined') {
                 // The implicit database connection created within the thread's scope
@@ -138,8 +132,8 @@ var workerThread = (function() {
                         logRetryAttempts: true,
                         overrideRetryAttempts: 3
                     };
-                    Object.assign(TestData, newOptions);
 
+                    TestData = Object.merge(TestData, newOptions);
                     load('jstests/libs/override_methods/auto_retry_on_network_error.js');
                 }
 
@@ -148,7 +142,7 @@ var workerThread = (function() {
                 // that database while we're waiting for a majority of nodes in the replica set to
                 // confirm it has been dropped. We load the
                 // implicitly_retry_on_database_drop_pending.js file to make it so that the clients
-                // started by the concurrency framework automatically retry their operation in the
+                // started by these concurrency framework automatically retry their operation in the
                 // face of this particular error response.
                 load('jstests/libs/override_methods/implicitly_retry_on_database_drop_pending.js');
             }