From 95fa2a23a77f7beadb49a1a339d14b0efa899b67 Mon Sep 17 00:00:00 2001
From: Tobias Schottdorf <tobias.schottdorf@gmail.com>
Date: Tue, 4 Jun 2019 22:45:21 +0200
Subject: [PATCH] roachtest: use 'fixtures import' from 'cockroach workload'

This was missed during #37726.

Closes #37488.
Touches #37163.

Release note: None
---
 pkg/cmd/roachtest/tpcc.go | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkg/cmd/roachtest/tpcc.go b/pkg/cmd/roachtest/tpcc.go
index 125df72fa9cc..bb7a12165ff9 100644
--- a/pkg/cmd/roachtest/tpcc.go
+++ b/pkg/cmd/roachtest/tpcc.go
@@ -60,13 +60,13 @@ type tpccOptions struct {
 // specified warehouse count into a cluster using either `fixtures import`
 // or `fixtures load` depending on the cloud.
 func tpccFixturesCmd(t *test, cloud string, warehouses int, extraArgs string) string {
-	var action string
+	var command string
 	switch cloud {
 	case "gce":
 		// TODO(nvanbenschoten): We could switch to import for both clouds.
 		// At the moment, import is still a little unstable and load is still
 		// marginally faster.
-		action = "load"
+		command = "./workload fixtures load"
 		fixtureWarehouses := -1
 		for _, w := range []int{1, 10, 100, 1000, 2000, 5000, 10000} {
 			if w >= warehouses {
@@ -79,12 +79,14 @@ func tpccFixturesCmd(t *test, cloud string, warehouses int, extraArgs string) st
 		}
 		warehouses = fixtureWarehouses
 	case "aws":
-		action = "import"
+		// For fixtures import, use the version built into the cockroach binary
+		// so the tpcc workload-versions match on release branches.
+		command = "./cockroach workload fixtures import"
 	default:
 		t.Fatalf("unknown cloud: %q", cloud)
 	}
-	return fmt.Sprintf("./workload fixtures %s tpcc --warehouses=%d %s {pgurl:1}",
-		action, warehouses, extraArgs)
+	return fmt.Sprintf("%s tpcc --warehouses=%d %s {pgurl:1}",
+		command, warehouses, extraArgs)
 }
 
 func runTPCC(ctx context.Context, t *test, c *cluster, opts tpccOptions) {
@@ -125,6 +127,8 @@ func runTPCC(ctx context.Context, t *test, c *cluster, opts tpccOptions) {
 		c.Put(ctx, cockroach, "./cockroach", regularNodes...)
 	}
 
+	// Fixture import needs ./cockroach workload on workloadNode.
+	c.Put(ctx, cockroach, "./cockroach", workloadNode)
 	c.Put(ctx, workload, "./workload", workloadNode)
 
 	t.Status("loading fixture")
@@ -668,6 +672,10 @@ func runTPCCBench(ctx context.Context, t *test, c *cluster, b tpccBenchSpec) {
 	roachNodes := loadGroups.roachNodes()
 	loadNodes := loadGroups.loadNodes()
 	c.Put(ctx, cockroach, "./cockroach", roachNodes)
+	// Fixture import needs ./cockroach workload on loadNodes[0],
+	// and if we use haproxy (see below) we need it on the others
+	// as well.
+	c.Put(ctx, cockroach, "./cockroach", loadNodes)
 	c.Put(ctx, workload, "./workload", loadNodes)
 	c.Start(ctx, t, append(b.startOpts(), roachNodes)...)
 
@@ -678,7 +686,6 @@ func runTPCCBench(ctx context.Context, t *test, c *cluster, b tpccBenchSpec) {
 		}
 		t.Status("installing haproxy")
 		c.Install(ctx, loadNodes, "haproxy")
-		c.Put(ctx, cockroach, "./cockroach", loadNodes)
 		c.Run(ctx, loadNodes, "./cockroach gen haproxy --insecure --url {pgurl:1}")
 		c.Run(ctx, loadNodes, "haproxy -f haproxy.cfg -D")
 	}