Merge #53798

53798: bulkio: Fix backup tpcc roachtest failure. r=miretskiy a=miretskiy Fixes #53728 Fixes #53591 Add a `--deprecated-fk-indexes` flag to workload command when running at version below 20.2. Release Notes: None Release Justification: release blocking roachtest fix. Co-authored-by: Yevgeniy Miretskiy <[email protected]>
cockroachdb · Sep 2, 2020 · 61f4203 · 61f4203
2 parents e04bc9a + 20ab584
commit 61f4203
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/pkg/cmd/roachtest/backup.go b/pkg/cmd/roachtest/backup.go
@@ -52,9 +52,15 @@ func registerBackup(r *testRegistry) {
 		c.Run(ctx, c.All(), `./workload csv-server --port=8081 &> logs/workload-csv-server.log < /dev/null &`)
 		time.Sleep(time.Second) // wait for csv server to open listener
 
-		c.Run(ctx, c.Node(1), "./workload", "fixtures", "import", "bank",
+		importArgs := []string{
+			"./workload", "fixtures", "import", "bank",
 			"--db=bank", "--payload-bytes=10240", "--ranges=0", "--csv-server", "http://localhost:8081",
-			fmt.Sprintf("--rows=%d", rows), "--seed=1", "{pgurl:1}")
+			fmt.Sprintf("--rows=%d", rows), "--seed=1", "{pgurl:1}",
+		}
+		if !t.buildVersion.AtLeast(version.MustParse("v20.2.0")) {
+			importArgs = append(importArgs, "--deprecated-fk-indexes")
+		}
+		c.Run(ctx, c.Node(1), importArgs...)
 
 		return dest
 	}