From 83dfef8e8f2b07b0f4df9a4818b04ddd3ef2c7de Mon Sep 17 00:00:00 2001 From: Nathan VanBenschoten Date: Wed, 22 Jul 2020 18:13:12 -0400 Subject: [PATCH 1/2] testcluster: don't create two stoppers in StartTestCluster This looks harmless because the first stopper was never actually used, but it was caught by #51413. --- pkg/testutils/testcluster/testcluster.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/testutils/testcluster/testcluster.go b/pkg/testutils/testcluster/testcluster.go index 87c358448b05..2341230a9761 100644 --- a/pkg/testutils/testcluster/testcluster.go +++ b/pkg/testutils/testcluster/testcluster.go @@ -141,7 +141,6 @@ func StartTestCluster(t testing.TB, nodes int, args base.TestClusterArgs) *TestC stopper: stop.NewStopper(), replicationMode: args.ReplicationMode, } - tc.stopper = stop.NewStopper() // Check if any of the args have a locality set. noLocalities := true From 7ff8965feb25d53931e721d04a61050d6316cc54 Mon Sep 17 00:00:00 2001 From: Paul Bardea Date: Thu, 23 Jul 2020 09:14:31 -0400 Subject: [PATCH 2/2] dump: fix dump-backwards-compatibility remote roachtest This commit changes the execution of the cockroach binary from `cockroach` to `./cockroach`. This follows how other CLI roachtests run the binary. Before this commit, this test would fail when run on a GCE roachprod cluster, it now passes. Release note: None --- pkg/cmd/roachtest/dump.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cmd/roachtest/dump.go b/pkg/cmd/roachtest/dump.go index 8d52127cdddd..777087867fd8 100644 --- a/pkg/cmd/roachtest/dump.go +++ b/pkg/cmd/roachtest/dump.go @@ -62,7 +62,7 @@ func runDump(nodes nodeListOption, mainVersion, expected string) versionStep { return func(ctx context.Context, t *test, u *versionUpgradeTest) { // Put the new version of Cockroach onto the node. u.uploadVersion(ctx, t, nodes, mainVersion) - raw, err := u.c.RunWithBuffer(ctx, t.logger(), nodes, `cockroach dump --insecure d`) + raw, err := u.c.RunWithBuffer(ctx, t.logger(), nodes, `./cockroach dump --insecure d`) if err != nil { t.Fatal(err) }