Skip to content

Commit 8b39430

Browse files
craig[bot]msbutler
craig[bot]
and
msbutler
committed
Merge #153490
153490: roachtest: skip flaky tests that use old fixture r=kev-cao a=msbutler Informs [#153489](#153489) Epic: none Release note: none Co-authored-by: Michael Butler <butler@cockroachlabs.com>
2 parents 2b316d4 + 1d29ae8 commit 8b39430

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

‎pkg/cmd/roachtest/tests/cancel.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ func registerCancel(r registry.Registry) {
185185
CompatibleClouds: registry.Clouds(spec.GCE, spec.Local),
186186
Suites: registry.Suites(registry.Nightly),
187187
Leases: registry.MetamorphicLeases,
188+
Skip: "153489. uses ancient tpch fixture",
188189
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
189190
runCancel(ctx, t, c, tpchQueriesToRun, true /* useDistsql */)
190191
},
@@ -199,6 +200,7 @@ func registerCancel(r registry.Registry) {
199200
CompatibleClouds: registry.Clouds(spec.GCE, spec.Local),
200201
Suites: registry.Suites(registry.Nightly),
201202
Leases: registry.MetamorphicLeases,
203+
Skip: "153489. uses ancient tpch fixture",
202204
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
203205
runCancel(ctx, t, c, tpchQueriesToRun, false /* useDistsql */)
204206
},

‎pkg/cmd/roachtest/tests/multitenant_tpch.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ func registerMultiTenantTPCH(r registry.Registry) {
155155
CompatibleClouds: registry.Clouds(spec.GCE, spec.Local),
156156
Suites: registry.Suites(registry.Nightly),
157157
Leases: registry.MetamorphicLeases,
158+
Skip: "153489. uses ancient tpch fixture",
158159
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
159160
runMultiTenantTPCH(ctx, t, c, enableDirectScans, sharedProcess)
160161
},

‎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: 1 addition & 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 {
@@ -331,6 +328,7 @@ WITH into_db = 'defaultdb', unsafe_restore_incompatible_version;
331328
Leases: registry.MetamorphicLeases,
332329
NativeLibs: registry.LibGEOS,
333330
Timeout: time.Minute * 20,
331+
Skip: "153489. uses ancient fixture",
334332
// NB: sqlsmith failures should never block a release.
335333
NonReleaseBlocker: true,
336334
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {

‎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: 1 addition & 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
`
@@ -193,6 +190,7 @@ WITH unsafe_restore_incompatible_version;
193190
// https://github.com/cockroachdb/cockroach/issues/105968
194191
CompatibleClouds: registry.Clouds(spec.GCE, spec.Local),
195192
Suites: registry.Suites(registry.Nightly),
193+
Skip: "153489. uses ancient tpch fixture",
196194
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
197195
runTPCDSVec(ctx, t, c)
198196
},

‎pkg/cmd/roachtest/tests/tpch_concurrency.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ func registerTPCHConcurrency(r registry.Registry) {
208208
CompatibleClouds: registry.Clouds(spec.GCE, spec.Local),
209209
Suites: registry.Suites(registry.Nightly),
210210
CockroachBinary: cockroachBinary,
211+
Skip: "153489. uses ancient tpch fixture",
211212
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
212213
runTPCHConcurrency(ctx, t, c, false /* disableStreamer */)
213214
},
@@ -223,6 +224,7 @@ func registerTPCHConcurrency(r registry.Registry) {
223224
CompatibleClouds: registry.Clouds(spec.GCE, spec.Local),
224225
Suites: registry.Suites(registry.Nightly),
225226
CockroachBinary: cockroachBinary,
227+
Skip: "153489. uses ancient tpch fixture",
226228
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
227229
runTPCHConcurrency(ctx, t, c, true /* disableStreamer */)
228230
},

‎pkg/cmd/roachtest/tests/tpchbench.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ func registerTPCHBenchSpec(r registry.Registry, b tpchBenchSpec) {
118118
// https://github.com/cockroachdb/cockroach/issues/105968
119119
CompatibleClouds: registry.Clouds(spec.GCE, spec.Local),
120120
Suites: registry.Suites(registry.Nightly),
121+
Skip: "153489. uses ancient tpch fixture",
121122
RequiresDeprecatedWorkload: true, // uses querybench
122123
PostProcessPerfMetrics: func(test string, histograms *roachtestutil.HistogramMetric) (roachtestutil.AggregatedPerfMetrics, error) {
123124

‎pkg/cmd/roachtest/tests/tpchvec.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,7 @@ func registerTPCHVec(r registry.Registry) {
600600
// https://github.com/cockroachdb/cockroach/issues/105968
601601
CompatibleClouds: registry.Clouds(spec.GCE, spec.Local),
602602
Suites: registry.Suites(registry.Nightly),
603+
Skip: "153489. uses ancient tpch fixture",
603604
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
604605
runTPCHVec(ctx, t, c, newTpchVecPerfTest(
605606
"sql.defaults.vectorize", /* settingName */
@@ -617,6 +618,7 @@ func registerTPCHVec(r registry.Registry) {
617618
// https://github.com/cockroachdb/cockroach/issues/105968
618619
CompatibleClouds: registry.Clouds(spec.GCE, spec.Local),
619620
Suites: registry.Suites(registry.Nightly),
621+
Skip: "153489. uses ancient tpch fixture",
620622
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
621623
runTPCHVec(ctx, t, c, tpchVecDiskTest{})
622624
},
@@ -631,6 +633,7 @@ func registerTPCHVec(r registry.Registry) {
631633
// https://github.com/cockroachdb/cockroach/issues/105968
632634
CompatibleClouds: registry.Clouds(spec.GCE, spec.Local),
633635
Suites: registry.Suites(registry.Nightly),
636+
Skip: "153489. uses ancient tpch fixture",
634637
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
635638
runTPCHVec(ctx, t, c, newTpchVecPerfTest(
636639
"sql.distsql.use_streamer.enabled", /* settingName */
@@ -649,6 +652,7 @@ func registerTPCHVec(r registry.Registry) {
649652
// https://github.com/cockroachdb/cockroach/issues/105968
650653
CompatibleClouds: registry.Clouds(spec.GCE, spec.Local),
651654
Suites: registry.Suites(registry.Nightly),
655+
Skip: "153489. uses ancient tpch fixture",
652656
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
653657
runTPCHVec(ctx, t, c, newTpchVecPerfTest(
654658
"sql.distsql.direct_columnar_scans.enabled", /* settingName */
@@ -667,6 +671,7 @@ func registerTPCHVec(r registry.Registry) {
667671
// https://github.com/cockroachdb/cockroach/issues/105968
668672
CompatibleClouds: registry.Clouds(spec.GCE, spec.Local),
669673
Suites: registry.Suites(registry.Nightly),
674+
Skip: "153489. uses ancient tpch fixture",
670675
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
671676
p := newTpchVecPerfTest(
672677
"sql.distsql.direct_columnar_scans.enabled", /* settingName */

0 commit comments

Comments
 (0)