Skip to content

Commit 2a78a5b

Browse files
committed
Revert "roachtest: deflake malformed subdir error in roachtests"
This reverts commit 570072f.
1 parent 191e4a1 commit 2a78a5b

File tree

4 files changed

+0
-13
lines changed

4 files changed

+0
-13
lines changed

pkg/cmd/roachtest/tests/schemachange.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ func registerSchemaChangeDuringKV(r registry.Registry) {
4141
db := c.Conn(ctx, t.L(), 1)
4242
defer db.Close()
4343

44-
if _, err := db.Exec(`SET CLUSTER SETTING backup.index.read.enabled = false`); err != nil {
45-
t.Fatal(err)
46-
}
47-
4844
m := c.NewDeprecatedMonitor(ctx, c.All())
4945
m.Go(func(ctx context.Context) error {
5046
t.Status("loading fixture")

pkg/cmd/roachtest/tests/sqlsmith.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,6 @@ WITH into_db = 'defaultdb', unsafe_restore_incompatible_version;
116116
allConns = append(allConns, c.Conn(ctx, t.L(), node))
117117
}
118118
conn := allConns[0]
119-
if _, err := conn.Exec(`SET CLUSTER SETTING backup.index.read.enabled = false`); err != nil {
120-
t.Fatal(err)
121-
}
122119
t.Status("executing setup")
123120
t.L().Printf("setup:\n%s", strings.Join(setup, "\n"))
124121
for _, stmt := range setup {

pkg/cmd/roachtest/tests/tpc_utils.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ func loadTPCHDataset(
4141
if err != nil {
4242
return err
4343
}
44-
if _, err := db.Exec(`SET CLUSTER SETTING backup.index.read.enabled = false`); err != nil {
45-
t.Fatal(err)
46-
}
4744
defer func() {
4845
if retErr == nil {
4946
if _, err = db.Exec("USE tpch"); err != nil {

pkg/cmd/roachtest/tests/tpcdsvec.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ func registerTPCDSVec(r registry.Registry) {
6565
); err != nil {
6666
t.Fatal(err)
6767
}
68-
if _, err := clusterConn.Exec(`SET CLUSTER SETTING backup.index.read.enabled = false`); err != nil {
69-
t.Fatal(err)
70-
}
7168
t.Status("restoring TPCDS dataset for Scale Factor 1")
7269
if _, err := clusterConn.Exec(
7370
`

0 commit comments

Comments
 (0)