Skip to content

Commit cd1e806

Browse files
craig[bot]sumeerbhola
andcommitted
Merge #143600
143600: tests: do not schedule backups in disk-full roachtest r=RaduBerinde a=sumeerbhola These attempts happen while the node is down, and seem to fail in trying to establish a SQL connection to the down node. Fixes #143350 Epic: none Release note: None Co-authored-by: sumeerbhola <[email protected]>
2 parents acb7431 + 6b4926b commit cd1e806

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

pkg/cmd/roachtest/tests/disk_full.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ func registerDiskFull(r registry.Registry) {
3535
t.Skip("you probably don't want to fill your local disk")
3636
}
3737

38-
c.Start(ctx, t.L(), option.DefaultStartOpts(), install.MakeClusterSettings(), c.CRDBNodes())
38+
startOpts := option.NewStartOpts(option.NoBackupSchedule)
39+
c.Start(ctx, t.L(), startOpts, install.MakeClusterSettings(), c.CRDBNodes())
3940

4041
// Node 1 will soon be killed, when the ballast file fills up its disk. To
4142
// ensure that the ranges containing system tables are available on other
@@ -100,7 +101,7 @@ func registerDiskFull(r registry.Registry) {
100101
// monitor detects the death, expect it.
101102
m.ExpectDeath()
102103

103-
err := c.StartE(ctx, t.L(), option.DefaultStartOpts(), install.MakeClusterSettings(), c.Node(n))
104+
err := c.StartE(ctx, t.L(), startOpts, install.MakeClusterSettings(), c.Node(n))
104105
t.L().Printf("starting n%d: error %v", n, err)
105106
if err == nil {
106107
t.Fatal("node successfully started unexpectedly")
@@ -134,7 +135,7 @@ func registerDiskFull(r registry.Registry) {
134135
t.L().Printf("removing the emergency ballast on n%d\n", n)
135136
m.ExpectDeath()
136137
c.Run(ctx, option.WithNodes(c.Node(n)), "rm -f {store-dir}/auxiliary/EMERGENCY_BALLAST")
137-
if err := c.StartE(ctx, t.L(), option.DefaultStartOpts(), install.MakeClusterSettings(), c.Node(n)); err != nil {
138+
if err := c.StartE(ctx, t.L(), startOpts, install.MakeClusterSettings(), c.Node(n)); err != nil {
138139
t.Fatal(err)
139140
}
140141
m.ResetDeaths()

0 commit comments

Comments
 (0)