Skip to content

Commit 1374908

Browse files
committed
Revert "kvprober: metamorphically enable / configure kvprober"
This reverts (most of) commit 769ba1c. That commit metamorphically enabled kvprober. This has been observed to be destabliziing to unit tests. When the metamorphic constant is enabled (50% of the time) and when kvprober is fast enough, random ranges will see extra requests that they aren’t expecting. This adds nondeterminism which can trip up tests in any number of different ways. All of the following flakes have been tracked back to kvprober: Fixes cockroachdb#107864. Fixes cockroachdb#108242. Fixes cockroachdb#108441. Fixes cockroachdb#108349. Fixes cockroachdb#108124. Closes cockroachdb#108366. Release note: None
1 parent 6aa4615 commit 1374908

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

pkg/kv/kvprober/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ go_library(
1717
"//pkg/roachpb",
1818
"//pkg/settings",
1919
"//pkg/settings/cluster",
20-
"//pkg/util",
2120
"//pkg/util/log",
2221
"//pkg/util/log/logcrash",
2322
"//pkg/util/metric",

pkg/kv/kvprober/settings.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@ import (
1414
"time"
1515

1616
"github.com/cockroachdb/cockroach/pkg/settings"
17-
"github.com/cockroachdb/cockroach/pkg/util"
1817
"github.com/cockroachdb/errors"
1918
)
2019

21-
var defaultEnabled = util.ConstantWithMetamorphicTestBool("kv.prober.*.enabled", false)
22-
2320
// kv.prober.bypass_admission_control controls whether kvprober's requests
2421
// should bypass kv layer's admission control. Setting this value to true
2522
// ensures that kvprober will not be significantly affected if the cluster is
@@ -30,13 +27,14 @@ var bypassAdmissionControl = settings.RegisterBoolSetting(
3027
"set to bypass admission control queue for kvprober requests; "+
3128
"note that dedicated clusters should have this set as users own capacity planning "+
3229
"but serverless clusters should not have this set as SREs own capacity planning",
33-
util.ConstantWithMetamorphicTestBool("kv.prober.bypass_admission_control.enabled", true))
30+
true,
31+
)
3432

3533
var readEnabled = settings.RegisterBoolSetting(
3634
settings.TenantWritable,
3735
"kv.prober.read.enabled",
3836
"whether the KV read prober is enabled",
39-
defaultEnabled)
37+
false)
4038

4139
// TODO(josh): Another option is for the cluster setting to be a QPS target
4240
// for the cluster as a whole.
@@ -72,7 +70,7 @@ var writeEnabled = settings.RegisterBoolSetting(
7270
settings.TenantWritable,
7371
"kv.prober.write.enabled",
7472
"whether the KV write prober is enabled",
75-
defaultEnabled)
73+
false)
7674

7775
var writeInterval = settings.RegisterDurationSetting(
7876
settings.TenantWritable,
@@ -150,7 +148,7 @@ var quarantineWriteEnabled = settings.RegisterBoolSetting(
150148
"quarantine pool holds a separate group of ranges that have previously failed "+
151149
"a probe which are continually probed. This helps determine outages for ranges "+
152150
" with a high level of confidence",
153-
defaultEnabled)
151+
false)
154152

155153
var quarantineWriteInterval = settings.RegisterDurationSetting(
156154
settings.TenantWritable,

0 commit comments

Comments
 (0)