SERVER-32852 Capture data files on failures of the concurrency suite

1 files changed, 11 insertions, 1 deletions

diff --git a/jstests/concurrency/fsm_libs/runner.js b/jstests/concurrency/fsm_libs/runner.js
index 9dbabcb7c00..f205544f019 100644
--- a/jstests/concurrency/fsm_libs/runner.js
+++ b/jstests/concurrency/fsm_libs/runner.js
@@ -700,6 +700,7 @@ var runner = (function() {
         var bgCleanup = [];
         var errors = [];
         var configServerData = [];
+        let activeException = false;
 
         try {
             prepareCollections(bgWorkloads, bgContext, cluster, clusterOptions, executionOptions);
@@ -759,6 +760,9 @@ var runner = (function() {
                                      configServerData,
                                      cleanupOptions);
                 });
+            } catch (err) {
+                activeException = true;
+                throw err;
             } finally {
                 // Set a flag so background threads know to terminate.
                 bgThreadMgr.markAllForTermination();
@@ -790,8 +794,14 @@ var runner = (function() {
                 }
 
                 throwError(workloadErrors);
+            } catch (err) {
+                activeException = true;
+                throw err;
             } finally {
-                cluster.teardown();
+                // We preserve the data files when an FSM workload failed so that they can later be
+                // archived to S3.
+                const opts = activeException ? {noCleanData: true} : {};
+                cluster.teardown(opts);
             }
         }
     }