Skip to content

Commit 8a20084

Browse files
craig[bot]tbg
andcommitted
Merge #144314
144314: kvserver: deflake TestMultiSSTWriterInitSST r=tbg a=tbg Need to disable a metamorphic variable. ``` ./dev test --stress --filter TestMultiSSTWriterInitSST ./pkg/kv/kvserver/ ``` Now passes. Previously it'd fail ~immediately. Fixes #144294. Epic: none Release note: None Co-authored-by: Tobias Grieger <[email protected]>
2 parents be3d469 + cb45d49 commit 8a20084

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

pkg/kv/kvserver/replica_sst_snapshot_storage_test.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,13 @@ func TestMultiSSTWriterInitSST(t *testing.T) {
284284
localSpans := keySpans[:len(keySpans)-1]
285285
mvccSpan := keySpans[len(keySpans)-1]
286286

287+
st := cluster.MakeTestingClusterSettings()
288+
289+
// Disabling columnar blocks causes stats changes.
290+
storage.ColumnarBlocksEnabled.Override(context.Background(), &st.SV, true)
291+
287292
msstw, err := newMultiSSTWriter(
288-
ctx, cluster.MakeTestingClusterSettings(), scratch, localSpans, mvccSpan, 0,
293+
ctx, st, scratch, localSpans, mvccSpan, 0,
289294
false /* skipRangeDelForMVCCSpan */, false, /* rangeKeysInOrder */
290295
)
291296
require.NoError(t, err)

0 commit comments

Comments
 (0)