Merge #83352

83352: roachtest: add new decommissionBench configurations r=AlexTalks a=AlexTalks

This change adds new configurations to the decommission benchmark test,
as well as cleaning up some existing configurations. This includes
benchmarking decommissions when we have a high number of store targets,
as well as decommissioning a node when we have just added a new node to
the cluster.

Depends on #81874, #82760.

Release note: None

Co-authored-by: Alex Sarkesian <[email protected]>

pkg/cmd/roachtest/tests/decommission.go

@@ -304,7 +304,9 @@ func runDecommission(
 			}
 
 			if whileDown {
-				h.stop(ctx, node)
+				if err := c.StopCockroachGracefullyOnNode(ctx, t.L(), node); err != nil {
+					return err
+				}
 			}
 
 			run(fmt.Sprintf(`ALTER RANGE default CONFIGURE ZONE = 'constraints: {"-node%d"}'`, node))
@@ -319,7 +321,9 @@ func runDecommission(
 			}
 
 			if !whileDown {
-				h.stop(ctx, node)
+				if err := c.StopCockroachGracefullyOnNode(ctx, t.L(), node); err != nil {
+					return err
+				}
 			}
 
 			// Wipe the node and re-add to cluster with a new node ID.
@@ -1150,14 +1154,6 @@ func newDecommTestHelper(t test.Test, c cluster.Cluster) *decommTestHelper {
 	}
 }
 
-// stop gracefully stops a node with a signal.
-func (h *decommTestHelper) stop(ctx context.Context, node int) {
-	opts := option.DefaultStopOpts()
-	opts.RoachprodOpts.Sig = 15 // SIGTERM
-	opts.RoachprodOpts.Wait = true
-	h.c.Stop(ctx, h.t.L(), opts, h.c.Node(node))
-}
-
 // getLogicalNodeID connects to the nodeIdx-th node in the roachprod cluster to
 // obtain the logical CockroachDB nodeID of this node. This is because nodes can
 // change ID as they are continuously decommissioned, wiped, and started anew.