Skip to content

Commit 1fca9b2

Browse files
authored
Merge pull request #155418 from stevendanna/ssd/disable-split-lock-reliability-25.2.7-rc
release-25.2.7-rc: concurrency: disable kv.lock_table.unreplicated_lock_reliability.split.enabled
2 parents 41e2413 + 0a9a185 commit 1fca9b2

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

pkg/kv/kvserver/concurrency/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ go_library(
3939
"//pkg/util/hlc",
4040
"//pkg/util/humanizeutil",
4141
"//pkg/util/log",
42-
"//pkg/util/metamorphic",
4342
"//pkg/util/metric",
4443
"//pkg/util/stop",
4544
"//pkg/util/syncutil",

pkg/kv/kvserver/concurrency/concurrency_manager.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"github.com/cockroachdb/cockroach/pkg/util/debugutil"
2828
"github.com/cockroachdb/cockroach/pkg/util/hlc"
2929
"github.com/cockroachdb/cockroach/pkg/util/log"
30-
"github.com/cockroachdb/cockroach/pkg/util/metamorphic"
3130
"github.com/cockroachdb/cockroach/pkg/util/metric"
3231
"github.com/cockroachdb/cockroach/pkg/util/stop"
3332
"github.com/cockroachdb/cockroach/pkg/util/uuid"
@@ -122,7 +121,7 @@ var UnreplicatedLockReliabilitySplit = settings.RegisterBoolSetting(
122121
settings.SystemOnly,
123122
"kv.lock_table.unreplicated_lock_reliability.split.enabled",
124123
"whether the replica should attempt to keep unreplicated locks during range splits",
125-
metamorphic.ConstantWithTestBool("kv.lock_table.unreplicated_lock_reliability.split.enabled", true),
124+
false,
126125
)
127126

128127
// UnreplicatedLockReliabilityLeaseTransfer controls whether the replica will attempt

0 commit comments

Comments
 (0)