From cc6146ffae917c260ee65ab92601aaaa66e27935 Mon Sep 17 00:00:00 2001 From: Arul Ajmani Date: Tue, 30 Jan 2024 11:07:28 -0500 Subject: [PATCH] concurrency: remove soon to be obselete validation Soon, we'll be introducing lock promotion, which makes this validation obsolete. References #110435 Release note: None --- pkg/kv/kvserver/concurrency/lock_table.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkg/kv/kvserver/concurrency/lock_table.go b/pkg/kv/kvserver/concurrency/lock_table.go index e1cdf01fb38b..58c2cc9b9752 100644 --- a/pkg/kv/kvserver/concurrency/lock_table.go +++ b/pkg/kv/kvserver/concurrency/lock_table.go @@ -3947,13 +3947,6 @@ func (kl *keyLocks) verify(st *cluster.Settings) error { for e1 := kl.queuedLockingRequests.Front(); e1 != nil; e1 = e1.Next() { qlr := e1.Value - // Queued locking requests should not belong to a transaction that already - // holds a lock. - if qlr.guard.txnMeta() != nil { - if _, found := kl.heldBy[qlr.guard.txnMeta().ID]; found { - return errors.AssertionFailedf("queued locking request belongs to the lock holder txn %s", kl) - } - } if !qlr.active { // not actively waiting; nothing more to check for inactive waiters continue }