Merge #67272

67272: roachtest: fix restore/nodeShutdown tests r=pbardea,stevendanna a=tbg I had to slightly change their use of the monitor in 1477c4c, and introduced a buglet in the process that would lead to all of these tests to fail. Fixes #67254 Fixes #67253 Fixes #67252 Fixes #67251 Fixes #67250 Fixes #67249 Release note: None Co-authored-by: Tobias Grieger <[email protected]>
cockroachdb · Jul 8, 2021 · 960d7d3 · 960d7d3
2 parents 7d0fd13 + f85afef
commit 960d7d3
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/pkg/cmd/roachtest/tests/jobs.go b/pkg/cmd/roachtest/tests/jobs.go
@@ -128,17 +128,13 @@ func jobSurvivesNodeShutdown(
 		return nil
 	})
 
-	// Let the current tasks finish and use a new monitor for the restart.
-	// This lets us separate the failure modes.
+	m.ExpectDeath()
 	m.Wait()
-	m = c.NewMonitor(ctx)
 
 	// NB: the roachtest harness checks that at the end of the test, all nodes
 	// that have data also have a running process.
 	t.Status(fmt.Sprintf("restarting %s (node restart test is done)\n", target))
 	if err := c.StartE(ctx, target); err != nil {
 		t.Fatal(errors.Wrapf(err, "could not restart node %s", target))
 	}
-
-	m.Wait()
 }