Skip to content

Commit

Permalink
concurrency: include promotion information when printing out locks
Browse files Browse the repository at this point in the history 
We only do so if a request is promoting its locks; otherwise, the lock
formatting remains the same as before (which is nice becuase it reduces
useless test churn).

Followup from cockroachdb#119671

Release note: None

Epic: none
  • Loading branch information
@arulajmani
arulajmani committed Apr 1, 2024
1 parent 55a5b64 commit 941f35d
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 37 deletions.
9 changes: 7 additions & 2 deletions pkg/kv/kvserver/concurrency/lock_table.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1885,8 +1885,13 @@ func (kl *keyLocks) safeFormat(sb *redact.StringBuilder, txnStatusCache *txnStat
for e := kl.queuedLockingRequests.Front(); e != nil; e = e.Next() {
qg := e.Value
g := qg.guard
sb.Printf(" active: %t req: %d, strength: %s, txn: ",
redact.Safe(qg.active), redact.Safe(qg.guard.seqNum), redact.Safe(qg.mode.Strength),
optPromotingMsg := ""
if qg.order.isPromoting {
optPromotingMsg = " promoting: true"
}
sb.Printf(" active: %t req: %d%s, strength: %s, txn: ",
redact.Safe(qg.active), redact.Safe(qg.order.reqSeqNum), redact.Safe(optPromotingMsg),
redact.Safe(qg.mode.Strength),
)
if g.txn == nil {
sb.SafeString("none\n")
Expand Down
66 changes: 33 additions & 33 deletions pkg/kv/kvserver/concurrency/testdata/lock_table/lock_promotion
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ num=1
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)]
queued locking requests:
active: false req: 2, strength: Intent, txn: 00000000-0000-0000-0000-000000000001
active: false req: 2 promoting: true, strength: Intent, txn: 00000000-0000-0000-0000-000000000001

# Replicated lock acquisition will cause us to forget the unreplicated lock.
acquire r=req2 k=a durability=r strength=intent
----
num=1
lock: "a"
queued locking requests:
active: false req: 2, strength: Intent, txn: 00000000-0000-0000-0000-000000000001
active: false req: 2 promoting: true, strength: Intent, txn: 00000000-0000-0000-0000-000000000001

dequeue r=req2
----
Expand Down Expand Up @@ -99,7 +99,7 @@ num=1
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)]
queued locking requests:
active: false req: 5, strength: Intent, txn: 00000000-0000-0000-0000-000000000001
active: false req: 5 promoting: true, strength: Intent, txn: 00000000-0000-0000-0000-000000000001
active: true req: 4, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000002

# For good measure, create a new request from txn3 that comes after req5, and
Expand All @@ -118,7 +118,7 @@ num=1
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)]
queued locking requests:
active: false req: 5, strength: Intent, txn: 00000000-0000-0000-0000-000000000001
active: false req: 5 promoting: true, strength: Intent, txn: 00000000-0000-0000-0000-000000000001
active: true req: 4, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000002
active: true req: 6, strength: Shared, txn: 00000000-0000-0000-0000-000000000003

Expand All @@ -141,8 +141,8 @@ num=1
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)]
queued locking requests:
active: false req: 5, strength: Intent, txn: 00000000-0000-0000-0000-000000000001
active: false req: 7, strength: Intent, txn: 00000000-0000-0000-0000-000000000001
active: false req: 5 promoting: true, strength: Intent, txn: 00000000-0000-0000-0000-000000000001
active: false req: 7 promoting: true, strength: Intent, txn: 00000000-0000-0000-0000-000000000001
active: true req: 4, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000002
active: true req: 6, strength: Shared, txn: 00000000-0000-0000-0000-000000000003

Expand Down Expand Up @@ -181,15 +181,15 @@ num=1
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
queued locking requests:
active: false req: 9, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: false req: 9 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001

acquire r=req9 k=a durability=u strength=exclusive
----
num=1
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0), (str: Shared seq: 0)]
queued locking requests:
active: false req: 9, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: false req: 9 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001

dequeue r=req9
----
Expand Down Expand Up @@ -240,7 +240,7 @@ num=1
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
queued locking requests:
active: false req: 12, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: false req: 12 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: true req: 11, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000002

acquire r=req12 k=a durability=u strength=exclusive
Expand All @@ -249,7 +249,7 @@ num=1
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0), (str: Shared seq: 0)]
queued locking requests:
active: false req: 12, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: false req: 12 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: true req: 11, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000002

dequeue r=req12
Expand Down Expand Up @@ -310,7 +310,7 @@ num=1
holders: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
queued locking requests:
active: true req: 15, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: true req: 15 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001

guard-state r=req15
----
Expand All @@ -322,7 +322,7 @@ num=1
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
queued locking requests:
active: false req: 15, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: false req: 15 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001

# ------------------------------------------------------------------------------
# Test for lock promotion from Shared -> Exclusive when there are 3 shared locks
Expand Down Expand Up @@ -390,7 +390,7 @@ num=1
txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
queued locking requests:
active: true req: 19, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: true req: 19 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001

guard-state r=req19
----
Expand All @@ -403,7 +403,7 @@ num=1
holders: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
queued locking requests:
active: true req: 19, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: true req: 19 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001

guard-state r=req19
----
Expand All @@ -415,7 +415,7 @@ num=1
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
queued locking requests:
active: false req: 19, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: false req: 19 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001

guard-state r=req19
----
Expand All @@ -432,15 +432,15 @@ num=1
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
queued locking requests:
active: false req: 19, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: false req: 19 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001

acquire r=req19 k=a durability=u strength=exclusive
----
num=1
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0), (str: Shared seq: 0)]
queued locking requests:
active: false req: 19, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: false req: 19 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001

dequeue r=req19
----
Expand Down Expand Up @@ -563,7 +563,7 @@ num=1
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
queued locking requests:
active: false req: 26, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: false req: 26 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: true req: 25, strength: Intent, txn: none

acquire r=req26 k=a durability=u strength=exclusive
Expand All @@ -572,7 +572,7 @@ num=1
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0), (str: Shared seq: 0)]
queued locking requests:
active: false req: 26, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: false req: 26 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: true req: 25, strength: Intent, txn: none

dequeue r=req26
Expand Down Expand Up @@ -711,8 +711,8 @@ num=1
holders: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
queued locking requests:
active: true req: 30, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: true req: 31, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000002
active: true req: 30 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: true req: 31 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000002

guard-state r=req30
----
Expand Down Expand Up @@ -877,7 +877,7 @@ num=2
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
queued locking requests:
active: false req: 35, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: false req: 35 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: false req: 34, strength: Shared, txn: 00000000-0000-0000-0000-000000000002
active: true req: 36, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000002
lock: "b"
Expand All @@ -891,7 +891,7 @@ num=2
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0), (str: Shared seq: 0)]
queued locking requests:
active: false req: 35, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: false req: 35 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: false req: 34, strength: Shared, txn: 00000000-0000-0000-0000-000000000002
active: true req: 36, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000002
lock: "b"
Expand Down Expand Up @@ -1000,7 +1000,7 @@ num=1
holders: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
queued locking requests:
active: true req: 39, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: true req: 39 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001

guard-state r=req39
----
Expand All @@ -1012,7 +1012,7 @@ num=1
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
queued locking requests:
active: false req: 39, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: false req: 39 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001

# ------------------------------------------------------------------------------
# Test that when a request transitions from promoting to non-promoting (because
Expand Down Expand Up @@ -1072,16 +1072,16 @@ num=1
holders: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
txn: 00000000-0000-0000-0000-000000000002 epoch: 1, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
queued locking requests:
active: true req: 42, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: true req: 43, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000002
active: true req: 42 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: true req: 43 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000002

update txn=txn1 ts=10 epoch=1 span=a ignored-seqs=0
----
num=1
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 1, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
queued locking requests:
active: false req: 43, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000002
active: false req: 43 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000002

scan r=req42
----
Expand All @@ -1097,7 +1097,7 @@ num=1
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 1, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
queued locking requests:
active: false req: 43, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000002
active: false req: 43 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000002
active: true req: 42, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001

# ------------------------------------------------------------------------------
Expand Down Expand Up @@ -1157,16 +1157,16 @@ num=1
holders: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
txn: 00000000-0000-0000-0000-000000000002 epoch: 1, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
queued locking requests:
active: true req: 46, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: true req: 47, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000002
active: true req: 46 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
active: true req: 47 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000002

release txn=txn1 span=a
----
num=1
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 1, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
queued locking requests:
active: false req: 47, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000002
active: false req: 47 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000002

scan r=req46
----
Expand All @@ -1182,5 +1182,5 @@ num=1
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 1, iso: Serializable, info: unrepl [(str: Shared seq: 0)]
queued locking requests:
active: false req: 47, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000002
active: false req: 47 promoting: true, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000002
active: true req: 46, strength: Exclusive, txn: 00000000-0000-0000-0000-000000000001
4 changes: 2 additions & 2 deletions pkg/kv/kvserver/concurrency/testdata/lock_table/replicated_locks
View file
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,7 @@ num=1
lock: "a"
holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 20.000000000,0, info: repl [Intent], unrepl [(str: Exclusive seq: 0)]
queued locking requests:
active: false req: 41, strength: Intent, txn: 00000000-0000-0000-0000-000000000002
active: false req: 41 promoting: true, strength: Intent, txn: 00000000-0000-0000-0000-000000000002
active: true req: 40, strength: Intent, txn: 00000000-0000-0000-0000-000000000001

# Ensure non-locking readers at various timestamps -- below the exclusive lock
Expand Down Expand Up @@ -932,5 +932,5 @@ num=1
req: 46, txn: 00000000-0000-0000-0000-000000000001
req: 45, txn: 00000000-0000-0000-0000-000000000001
queued locking requests:
active: false req: 41, strength: Intent, txn: 00000000-0000-0000-0000-000000000002
active: false req: 41 promoting: true, strength: Intent, txn: 00000000-0000-0000-0000-000000000002
active: true req: 40, strength: Intent, txn: 00000000-0000-0000-0000-000000000001

0 comments on commit 941f35d

Please sign in to comment.