testserver: expose NoFileCleanup option to allow retention of files after Stop

testserver/testserver.go

@@ -240,6 +240,7 @@ type testServerArgs struct {
 	envVars                     []string // to be passed to cmd.Env
 	localityFlags               []string
 	cockroachLogsDir            string
+	noFileCleanup               bool // do not clean files at `Stop`
 }
 
 // CockroachBinaryPathOpt is a TestServer option that can be passed to
@@ -274,6 +275,14 @@ func StoreOnDiskOpt() TestServerOpt {
 	}
 }
 
+// NoFileCleanup is a TestServer option that can be passed to NewTestServer
+// to skip cleanup of files when Testserver is stopped
+func NoFileCleanup() TestServerOpt {
+	return func(args *testServerArgs) {
+		args.noFileCleanup = true
+	}
+}
+
 // SetStoreMemSizeOpt is a TestServer option that can be passed to NewTestServer
 // to set the proportion of available memory that is allocated
 // to the test server.
@@ -879,7 +888,9 @@ func (ts *testServerImpl) Stop() {
 		ts.mu.RLock()
 
 		nodeDir := filepath.Join(ts.baseDir, strconv.Itoa(i))
-		if err := os.RemoveAll(nodeDir); err != nil {
+		if ts.serverArgs.noFileCleanup {
+			log.Printf("%s: skipping file cleanup of node-dir %s", testserverMessagePrefix, nodeDir)
+		} else if err := os.RemoveAll(nodeDir); err != nil {
 			log.Printf("error deleting tmp directory %s for node: %s", nodeDir, err)
 		}
 		if closeErr := ts.nodes[i].stdoutBuf.Close(); closeErr != nil {
@@ -891,7 +902,11 @@ func (ts *testServerImpl) Stop() {
 	}
 
 	// Only cleanup on intentional stops.
-	_ = os.RemoveAll(ts.baseDir)
+	if ts.serverArgs.noFileCleanup {
+		log.Printf("%s: skipping file cleanup of base-dir %s", testserverMessagePrefix, ts.baseDir)
+	} else {
+		_ = os.RemoveAll(ts.baseDir)
+	}
 }
 
 func (ts *testServerImpl) CockroachInit() error {

testserver/testserver_test.go

@@ -234,6 +234,12 @@ func TestRunServer(t *testing.T) {
 				)
 			},
 		},
+		{
+			name: "No File Cleanup",
+			instantiation: func(t *testing.T) (*sql.DB, func()) {
+				return testserver.NewDBForTest(t, testserver.NoFileCleanup())
+			},
+		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			db, stop := tc.instantiation(t)