Skip to content

Commit f098093

Browse files
committed
roachtest/decommission: deflake decommission/drains/dead
This commit does two things: 1) Runs decommission/drains tests with more verbosity using the vmodule settings. 2) Increases the time we wait for decommission to finish. This helps mitigate cases where the replicate queue fails to enqueue a range for some reason, and it takes ~5-10 minutes until it enqueues that range again. If that happened, the test could have failed waiting for 1 or more replicas to be removed out of the decommissioned node. Fixes: #158482 Release note: None
1 parent 51d7523 commit f098093

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

pkg/cmd/roachtest/tests/decommission.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,7 +1001,8 @@ func runDecommissionDrains(ctx context.Context, t test.Test, c cluster.Cluster,
10011001
decommNodeID = numNodes
10021002
decommNode = c.Node(decommNodeID)
10031003
)
1004-
c.Start(ctx, t.L(), option.DefaultStartOpts(), install.MakeClusterSettings(), c.All())
1004+
1005+
c.Start(ctx, t.L(), withDecommissionVMod(option.DefaultStartOpts()), install.MakeClusterSettings(), c.All())
10051006

10061007
h := newDecommTestHelper(t, c)
10071008

@@ -1026,7 +1027,7 @@ func runDecommissionDrains(ctx context.Context, t test.Test, c cluster.Cluster,
10261027

10271028
// Decommission node 4 and poll its status during the decommission.
10281029
var (
1029-
maxAttempts = 50
1030+
maxAttempts = 125
10301031
retryOpts = retry.Options{
10311032
InitialBackoff: time.Second,
10321033
MaxBackoff: 5 * time.Second,
@@ -1518,7 +1519,8 @@ func execCLIExt(
15181519
// debugging failures.
15191520
const decommissionVModuleStartOpts = `--vmodule=store_rebalancer=5,allocator=5,
15201521
allocator_scorer=5,replicate_queue=5,replicate=6,split_queue=5,
1521-
replica_command=2,replica_raft=2,replica_proposal=2,replica_application_result=1`
1522+
replica_command=2,replica_raft=2,replica_proposal=2,replica_application_result=1,
1523+
replica_range_lease=3,raft=4,replica_raft_quiesce=3`
15221524

15231525
func withDecommissionVMod(startOpts option.StartOpts) option.StartOpts {
15241526
startOpts.RoachprodOpts.ExtraArgs = append(

0 commit comments

Comments
 (0)