From ea5dce385dbf00b367b70efbbfee53baec26a751 Mon Sep 17 00:00:00 2001 From: Erik Grinaker Date: Wed, 29 Mar 2023 22:16:16 +0000 Subject: [PATCH] kvserver: disable kv.expiration_leases_only.enabled metamorphism This can prevent closed timestamp updates, causing test flakes. Epic: none Release note: None --- pkg/kv/kvserver/replica_range_lease.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/kv/kvserver/replica_range_lease.go b/pkg/kv/kvserver/replica_range_lease.go index a5880ccf0fe5..c81cc8c23651 100644 --- a/pkg/kv/kvserver/replica_range_lease.go +++ b/pkg/kv/kvserver/replica_range_lease.go @@ -57,7 +57,6 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv/kvserver/raftutil" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings" - "github.com/cockroachdb/cockroach/pkg/util" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/retry" @@ -80,7 +79,10 @@ var ExpirationLeasesOnly = settings.RegisterBoolSetting( settings.SystemOnly, "kv.expiration_leases_only.enabled", "only use expiration-based leases, never epoch-based ones (experimental, affects performance)", - util.ConstantWithMetamorphicTestBool("kv.expiration_leases_only.enabled", false), + false, + // TODO(erikgrinaker): Make this metamorphic when they don't prevent closed + // timestamp updates: https://github.com/cockroachdb/cockroach/issues/99812 + //util.ConstantWithMetamorphicTestBool("kv.expiration_leases_only.enabled", false), ) var leaseStatusLogLimiter = func() *log.EveryN {