diff --git a/pkg/kv/kvserver/concurrency/lock_table.go b/pkg/kv/kvserver/concurrency/lock_table.go index b7b5a1646c9e..3364c890070a 100644 --- a/pkg/kv/kvserver/concurrency/lock_table.go +++ b/pkg/kv/kvserver/concurrency/lock_table.go @@ -923,37 +923,105 @@ type queuedGuard struct { // Information about a lock holder for unreplicated locks. type unreplicatedLockHolderInfo struct { - // Lock strength is always lock.Exclusive. - - // All the TxnSeqs in the current epoch at which this lock has been acquired, - // in increasing order. We track these so that if a lock is acquired at both - // seq 5 and seq 7, rollback of 7 does not cause the lock to be released. This - // consistent with PostgreSQL semantics; see: - // https://www.postgresql.org/docs/12/sql-select.html#SQL-FOR-UPDATE-SHARE - seqs []enginepb.TxnSeq + // infos tracks whether the lock is held with a particular strength; if it is, + // the lowest sequence number (that hasn't been rolled back) that it was + // acquired with is stored. If the lock isn't held with a particular strength, + // a sentinel value (-1) is stored. + // + // NB: Intents cannot be held/acquired in unreplicated fashion; thus the + // highest lock strength for unreplicated locks is Exclusive. + infos [lock.Exclusive + 1]enginepb.TxnSeq // The timestamp at which the unreplicated lock is held. Must not regress. ts hlc.Timestamp } +// init initializes an unreplicatedLockHolderInfo struct. +func (ulh *unreplicatedLockHolderInfo) init() { + for str := lock.None; str <= lock.Exclusive; str++ { + ulh.infos[str] = -1 + } +} + // clear removes previously tracked unreplicated lock holder information. func (ulh *unreplicatedLockHolderInfo) clear() { - ulh.seqs = nil + for str := lock.None; str <= lock.Exclusive; str++ { + ulh.infos[str] = -1 + } ulh.ts = hlc.Timestamp{} } +// epochBumped is called when a transaction is known to have its epoch bumped. +// State specific to the previous epoch is cleared out. +func (ulh *unreplicatedLockHolderInfo) epochBumped() { + for str := lock.None; str <= lock.Exclusive; str++ { + ulh.infos[str] = -1 + } +} + +// acquire updates tracking on the receiver, if necessary[1], to denote the lock +// is held with the supplied lock strength and sequence number. +// +// [1] We only track the lowest (non-rolled back) sequence number with which a +// lock is held, as doing so is sufficient. +func (ulh *unreplicatedLockHolderInfo) acquire(str lock.Strength, seqNum enginepb.TxnSeq) { + if !ulh.held(str) || + // ... OR we've been made aware of an acquisition at a lower sequence number + ulh.infos[str] > seqNum { + ulh.infos[str] = seqNum + } +} + +// held returns true if the receiver is held with the supplied lock strength. +func (ulh *unreplicatedLockHolderInfo) held(str lock.Strength) bool { + return ulh.infos[str] != -1 +} + +// rollbackIgnoredSeqNumbers mutates the receiver to rollback any locks that are +// known to be held at sequence numbers that are known to be rolled back. +func (ulh *unreplicatedLockHolderInfo) rollbackIgnoredSeqNumbers( + ignoredSeqNums []enginepb.IgnoredSeqNumRange, +) { + if len(ignoredSeqNums) == 0 { + return + } + for str := lock.None; str <= lock.Exclusive; str++ { + if ulh.infos[str] == -1 { + continue + } + i := sort.Search(len(ignoredSeqNums), func(i int) bool { return ignoredSeqNums[i].End >= ulh.infos[str] }) + shouldIgnore := i != len(ignoredSeqNums) && ulh.infos[str] >= ignoredSeqNums[i].Start + if shouldIgnore { + ulh.infos[str] = -1 + } + } +} + func (ulh *unreplicatedLockHolderInfo) isEmpty() bool { - return ulh.seqs == nil && ulh.ts.IsEmpty() + for str := lock.None; str <= lock.Exclusive; str++ { + if ulh.held(str) { // lock is held + return false + } + } + assert(ulh.ts.IsEmpty(), "lock not held, timestamp should be empty") + return true } func (ulh *unreplicatedLockHolderInfo) safeFormat(sb *redact.StringBuilder) { if ulh.isEmpty() { return } - sb.SafeString("unrepl ") - sb.Printf("seqs: [%d", redact.Safe(ulh.seqs[0])) - for j := 1; j < len(ulh.seqs); j++ { - sb.Printf(", %d", redact.Safe(ulh.seqs[j])) + sb.SafeString("unrepl [") + first := true + for str := lock.None; str <= lock.Exclusive; str++ { + if !ulh.held(str) { + continue + } + if !first { + sb.Printf(", ") + } + first = false + sb.Printf("(str: %s seq: %d)", redact.Safe(str), redact.Safe(ulh.infos[str])) } sb.SafeString("]") } @@ -1728,7 +1796,24 @@ func (l *lockState) getLockMode() lock.Mode { if l.isHeldReplicated() { return lock.MakeModeIntent(lockHolderTS) } - return lock.MakeModeExclusive(lockHolderTS, lockHolderTxn.IsoLevel) + + // Iterate from the strongest to weakest lock strength. + for str := lock.Exclusive; str >= lock.None; str-- { + if !l.holder.unreplicatedInfo.held(str) { + continue + } + switch str { + case lock.Exclusive: + return lock.MakeModeExclusive(lockHolderTS, lockHolderTxn.IsoLevel) + case lock.Update: + panic(fmt.Sprintf("unhandled lock strength %s", lock.Update)) + case lock.Shared: + panic(fmt.Sprintf("unhandled lock strength %s", lock.Shared)) + case lock.None: + panic(fmt.Sprintf("unhandled lock strength %s", lock.None)) + } + } + panic("unreachable") } // Removes the current lock holder from the lock. @@ -2294,22 +2379,17 @@ func (l *lockState) acquireLock(acq *roachpb.LockAcquisition, clock *hlc.Clock) if acq.Durability == lock.Unreplicated && l.isHeldUnreplicated() { switch { case l.holder.txn.Epoch < acq.Txn.Epoch: // at a higher epoch - // Clear sequence numbers from the older epoch. - l.holder.unreplicatedInfo.seqs = l.holder.unreplicatedInfo.seqs[:0] + // Clear sequence number tracking from the older epoch. + l.holder.unreplicatedInfo.epochBumped() case l.holder.txn.Epoch == acq.Txn.Epoch: // at the same epoch // Prune the list of sequence numbers tracked for this lock by removing // any sequence numbers that are considered ignored by virtue of a // savepoint rollback. // // Note that the in-memory lock table is the source of truth for just - // unreplicated locks, so we only do this pruning for unreplicated lock - // acquisition. On the other hand, for replicated locks, the source of - // truth is what's written in MVCC. We could try and mimic that logic - // here, but we choose not to, as doing so is error-prone/difficult to - // maintain. - l.holder.unreplicatedInfo.seqs = removeIgnored( - l.holder.unreplicatedInfo.seqs, acq.IgnoredSeqNums, - ) + // unreplicated locks, and as such, sequence numbers are only tracked + // for them. + l.holder.unreplicatedInfo.rollbackIgnoredSeqNumbers(acq.IgnoredSeqNums) case l.holder.txn.Epoch > acq.Txn.Epoch: // at a prior epoch // Reject the request; the logic here parallels how mvccPutInternal // handles this case for intents. @@ -2365,7 +2445,7 @@ func (l *lockState) acquireLock(acq *roachpb.LockAcquisition, clock *hlc.Clock) switch acq.Durability { case lock.Unreplicated: l.holder.unreplicatedInfo.ts.Forward(acq.Txn.WriteTimestamp) - l.holder.unreplicatedInfo.seqs = append(l.holder.unreplicatedInfo.seqs, acq.Txn.Sequence) + l.holder.unreplicatedInfo.acquire(acq.Strength, acq.Txn.Sequence) case lock.Replicated: l.holder.replicatedInfo.ts.Forward(acq.Txn.WriteTimestamp) default: @@ -2453,7 +2533,7 @@ func (l *lockState) acquireLock(acq *roachpb.LockAcquisition, clock *hlc.Clock) switch acq.Durability { case lock.Unreplicated: l.holder.unreplicatedInfo.ts = acq.Txn.WriteTimestamp - l.holder.unreplicatedInfo.seqs = append([]enginepb.TxnSeq(nil), acq.Txn.Sequence) + l.holder.unreplicatedInfo.acquire(acq.Strength, acq.Txn.Sequence) case lock.Replicated: l.holder.replicatedInfo.ts = acq.Txn.WriteTimestamp default: @@ -2475,35 +2555,17 @@ func (l *lockState) isIdempotentLockAcquisition(acq *roachpb.LockAcquisition) bo assert(txn.ID == acq.Txn.ID, "existing lock transaction is different from the acquisition") switch acq.Durability { case lock.Unreplicated: - seqs := l.holder.unreplicatedInfo.seqs - // Cheaply check if this could be an idempotent lock acquisition. - if len(seqs) > 0 && seqs[len(seqs)-1] >= acq.Txn.Sequence { - // Idempotent lock acquisition. In this case, we simply ignore the lock - // acquisition as long as it corresponds to an existing sequence number. - // If the sequence number is not being tracked yet, insert it into the - // sequence history. The validity of such a lock re-acquisition should - // have already been determined at the MVCC level. - - if i := sort.Search(len(seqs), func(i int) bool { - return seqs[i] >= acq.Txn.Sequence - }); i == len(seqs) { - panic("lockTable bug - search value <= last element") - } else if seqs[i] != acq.Txn.Sequence { - // TODO(arul): Once we change the lockState datastructure to only track - // the highest sequence number, we should remove all mutations happening - // inside this function. - seqs = append(seqs, 0) - copy(seqs[i+1:], seqs[i:]) - seqs[i] = acq.Txn.Sequence - l.holder.unreplicatedInfo.seqs = seqs - } + if !l.holder.unreplicatedInfo.held(acq.Strength) { // unheld lock + return false + } + // Lock is being re-acquired at a higher sequence number when it's already + // held at a lower sequence number. + return l.holder.unreplicatedInfo.infos[acq.Strength] <= acq.Txn.Sequence && // NB: Lock re-acquisitions at different timestamps are not considered // idempotent. Strictly speaking, we could tighten this condition to // consider lock re-acquisition at lower timestamps idempotent, as a // lock's timestamp at a given durability never regresses. - return l.holder.unreplicatedInfo.ts.Equal(acq.Txn.WriteTimestamp) - } - return false + l.holder.unreplicatedInfo.ts.Equal(acq.Txn.WriteTimestamp) case lock.Replicated: // NB: Lock re-acquisitions at different timestamps are not considered // idempotent. Strictly speaking, we could tighten this condition to @@ -2687,25 +2749,6 @@ func (l *lockState) tryClearLock(force bool) bool { return true } -// Removes the TxnSeqs in heldSeqNums that are contained in ignoredSeqNums. -// REQUIRES: ignoredSeqNums contains non-overlapping ranges and sorted in -// increasing seq order. -func removeIgnored( - heldSeqNums []enginepb.TxnSeq, ignoredSeqNums []enginepb.IgnoredSeqNumRange, -) []enginepb.TxnSeq { - if len(ignoredSeqNums) == 0 { - return heldSeqNums - } - held := heldSeqNums[:0] - for _, n := range heldSeqNums { - i := sort.Search(len(ignoredSeqNums), func(i int) bool { return ignoredSeqNums[i].End >= n }) - if i == len(ignoredSeqNums) || ignoredSeqNums[i].Start > n { - held = append(held, n) - } - } - return held -} - // Tries to update the lock: noop if this lock is held by a different // transaction, else the lock is updated. Returns whether the lockState can be // garbage collected, and whether it was held by the txn. @@ -2762,8 +2805,17 @@ func (l *lockState) tryUpdateLockLocked(up roachpb.LockUpdate) (heldByTxn, gc bo // ...update corresponds to the current epoch. case txn.Epoch == l.holder.txn.Epoch: - l.holder.unreplicatedInfo.seqs = removeIgnored(l.holder.unreplicatedInfo.seqs, up.IgnoredSeqNums) - if len(l.holder.unreplicatedInfo.seqs) == 0 { + l.holder.unreplicatedInfo.rollbackIgnoredSeqNumbers(up.IgnoredSeqNums) + // Check if the lock is still held after rolling back ignored sequence + // numbers. + held := false + for str := lock.None; str <= lock.Exclusive; str++ { + if l.holder.unreplicatedInfo.held(str) { + held = true + break + } + } + if !held { l.holder.unreplicatedInfo.clear() isLocked = false break @@ -3282,6 +3334,7 @@ func (t *lockTableImpl) AddDiscoveredLock( l = &lockState{id: lockSeqNum, key: key} l.queuedWriters.Init() l.waitingReaders.Init() + l.holder.unreplicatedInfo.init() t.locks.Set(l) atomic.AddInt64(&t.locks.numLocks, 1) } else { @@ -3347,6 +3400,7 @@ func (t *lockTableImpl) AcquireLock(acq *roachpb.LockAcquisition) error { l = &lockState{id: lockSeqNum, key: acq.Key} l.queuedWriters.Init() l.waitingReaders.Init() + l.holder.unreplicatedInfo.init() t.locks.Set(l) atomic.AddInt64(&t.locks.numLocks, 1) } else { diff --git a/pkg/kv/kvserver/concurrency/lock_table_test.go b/pkg/kv/kvserver/concurrency/lock_table_test.go index 00f8dbd54a6d..08620c42f57d 100644 --- a/pkg/kv/kvserver/concurrency/lock_table_test.go +++ b/pkg/kv/kvserver/concurrency/lock_table_test.go @@ -1886,15 +1886,15 @@ func TestLockStateSafeFormat(t *testing.T) { } l.holder.txn = &enginepb.TxnMeta{ID: uuid.NamespaceDNS} // TODO(arul): add something about replicated locks here too. - l.holder.unreplicatedInfo = unreplicatedLockHolderInfo{ - ts: hlc.Timestamp{WallTime: 123, Logical: 7}, - seqs: []enginepb.TxnSeq{1}, - } + l.holder.unreplicatedInfo.init() + l.holder.unreplicatedInfo.ts = hlc.Timestamp{WallTime: 123, Logical: 7} + l.holder.unreplicatedInfo.infos[lock.Exclusive] = 1 + l.holder.unreplicatedInfo.infos[lock.Shared] = 3 require.EqualValues(t, - " lock: ‹\"KEY\"›\n holder: txn: 6ba7b810-9dad-11d1-80b4-00c04fd430c8 epoch: 0, iso: Serializable, ts: 0.000000123,7, info: unrepl seqs: [1]\n", + " lock: ‹\"KEY\"›\n holder: txn: 6ba7b810-9dad-11d1-80b4-00c04fd430c8 epoch: 0, iso: Serializable, ts: 0.000000123,7, info: unrepl [(str: Shared seq: 3), (str: Exclusive seq: 1)]\n", redact.Sprint(l)) require.EqualValues(t, - " lock: ‹×›\n holder: txn: 6ba7b810-9dad-11d1-80b4-00c04fd430c8 epoch: 0, iso: Serializable, ts: 0.000000123,7, info: unrepl seqs: [1]\n", + " lock: ‹×›\n holder: txn: 6ba7b810-9dad-11d1-80b4-00c04fd430c8 epoch: 0, iso: Serializable, ts: 0.000000123,7, info: unrepl [(str: Shared seq: 3), (str: Exclusive seq: 1)]\n", redact.Sprint(l).Redact()) } diff --git a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/basic b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/basic index 1f115ad371c2..cb88a273d0e9 100644 --- a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/basic +++ b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/basic @@ -58,7 +58,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 12.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 12.000000000,1, info: unrepl [(str: Exclusive seq: 0)] finish req=req2 ---- @@ -68,7 +68,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 12.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 12.000000000,1, info: unrepl [(str: Exclusive seq: 0)] reset ---- diff --git a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/clear_abandoned_intents b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/clear_abandoned_intents index 660f8f4a746a..a1437fa78271 100644 --- a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/clear_abandoned_intents +++ b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/clear_abandoned_intents @@ -342,9 +342,9 @@ num=4 lock: "b" holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl lock: "g" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "h" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] sequence req=req1 ---- @@ -368,9 +368,9 @@ num=4 lock: "b" holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl lock: "g" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "h" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] debug-advance-clock ts=123 ---- @@ -531,9 +531,9 @@ debug-lock-table ---- num=5 lock: "a" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000004-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000004-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "c" holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl queued writers: @@ -568,12 +568,12 @@ debug-lock-table ---- num=5 lock: "a" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] waiting readers: req: 8, txn: 00000002-0000-0000-0000-000000000000 distinguished req: 8 lock: "b" - holder: txn: 00000004-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000004-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "c" holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl queued writers: @@ -613,7 +613,7 @@ debug-lock-table ---- num=4 lock: "b" - holder: txn: 00000004-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000004-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] waiting readers: req: 8, txn: 00000002-0000-0000-0000-000000000000 distinguished req: 8 diff --git a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/deadlocks b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/deadlocks index 7739e44f8c00..43703691d857 100644 --- a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/deadlocks +++ b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/deadlocks @@ -83,11 +83,11 @@ debug-lock-table ---- num=3 lock: "a" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # -------------------------------- # Setup complete, test starts here @@ -145,17 +145,17 @@ debug-lock-table ---- num=3 lock: "a" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] waiting readers: req: 6, txn: 00000003-0000-0000-0000-000000000000 distinguished req: 6 lock: "b" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] waiting readers: req: 4, txn: 00000001-0000-0000-0000-000000000000 distinguished req: 4 lock: "c" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] waiting readers: req: 5, txn: 00000002-0000-0000-0000-000000000000 distinguished req: 5 @@ -293,11 +293,11 @@ debug-lock-table ---- num=3 lock: "a" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # -------------------------------- # Setup complete, test starts here @@ -370,18 +370,18 @@ debug-lock-table ---- num=3 lock: "a" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 10, txn: 00000004-0000-0000-0000-000000000000 active: true req: 13, txn: 00000003-0000-0000-0000-000000000000 distinguished req: 10 lock: "b" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 11, txn: 00000001-0000-0000-0000-000000000000 distinguished req: 11 lock: "c" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 12, txn: 00000002-0000-0000-0000-000000000000 distinguished req: 12 @@ -537,11 +537,11 @@ debug-lock-table ---- num=3 lock: "a" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] new-request name=req4w txn=txn4 ts=10,1 put key=b value=v2 @@ -573,12 +573,12 @@ debug-lock-table ---- num=3 lock: "a" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "b" queued writers: active: false req: 17, txn: 00000004-0000-0000-0000-000000000000 lock: "c" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 17, txn: 00000004-0000-0000-0000-000000000000 distinguished req: 17 @@ -624,7 +624,7 @@ debug-lock-table ---- num=3 lock: "a" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 19, txn: 00000003-0000-0000-0000-000000000000 distinguished req: 19 @@ -634,7 +634,7 @@ num=3 active: true req: 18, txn: 00000001-0000-0000-0000-000000000000 distinguished req: 18 lock: "c" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 17, txn: 00000004-0000-0000-0000-000000000000 distinguished req: 17 @@ -773,11 +773,11 @@ debug-lock-table ---- num=3 lock: "a" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] new-request name=req4w txn=txn4 ts=10,1 put key=b value=v2 @@ -809,12 +809,12 @@ debug-lock-table ---- num=3 lock: "a" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "b" queued writers: active: false req: 23, txn: 00000004-0000-0000-0000-000000000000 lock: "c" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 23, txn: 00000004-0000-0000-0000-000000000000 distinguished req: 23 @@ -860,7 +860,7 @@ debug-lock-table ---- num=3 lock: "a" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 25, txn: 00000003-0000-0000-0000-000000000000 distinguished req: 25 @@ -870,7 +870,7 @@ num=3 active: true req: 24, txn: 00000001-0000-0000-0000-000000000000 distinguished req: 24 lock: "c" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 23, txn: 00000004-0000-0000-0000-000000000000 distinguished req: 23 @@ -1016,11 +1016,11 @@ debug-lock-table ---- num=3 lock: "a" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] new-request name=req4w txn=txn4 ts=10,1 put key=a value=v2 @@ -1092,7 +1092,7 @@ num=3 active: true req: 30, txn: 00000004-0000-0000-0000-000000000000 distinguished req: 30 lock: "c" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 29, txn: 00000005-0000-0000-0000-000000000000 distinguished req: 29 @@ -1133,7 +1133,7 @@ num=3 active: true req: 30, txn: 00000004-0000-0000-0000-000000000000 distinguished req: 30 lock: "c" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 29, txn: 00000005-0000-0000-0000-000000000000 distinguished req: 29 diff --git a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/lock_timeout b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/lock_timeout index 56efb70330ab..eb4d3011486f 100644 --- a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/lock_timeout +++ b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/lock_timeout @@ -79,14 +79,14 @@ debug-lock-table ---- num=3 lock: "k" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "k2" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 3, txn: 00000003-0000-0000-0000-000000000000 distinguished req: 3 lock: "k3" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] # ------------------------------------------------------------- # Read-only request with lock timeout hits lock. The request @@ -143,7 +143,7 @@ num=2 queued writers: active: false req: 3, txn: 00000003-0000-0000-0000-000000000000 lock: "k3" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 3, txn: 00000003-0000-0000-0000-000000000000 distinguished req: 3 @@ -210,7 +210,7 @@ num=3 queued writers: active: false req: 3, txn: 00000003-0000-0000-0000-000000000000 lock: "k3" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 3, txn: 00000003-0000-0000-0000-000000000000 distinguished req: 3 diff --git a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/optimistic b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/optimistic index faefca4d1c24..c0d4c4a8ab77 100644 --- a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/optimistic +++ b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/optimistic @@ -23,7 +23,7 @@ debug-lock-table ---- num=1 lock: "d" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] finish req=req1 ---- @@ -45,7 +45,7 @@ debug-lock-table ---- num=1 lock: "d" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # When checking with a span that does not include the existing lock, there is # no conflict. @@ -74,7 +74,7 @@ debug-lock-table ---- num=1 lock: "d" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # Wider span for req3 has a conflict. check-opt-no-conflicts req=req3 diff --git a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/priority b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/priority index b4a49bd0778c..71efdc70fd2b 100644 --- a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/priority +++ b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/priority @@ -105,17 +105,17 @@ debug-lock-table ---- num=6 lock: "kHigh1" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "kHigh2" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "kLow1" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "kLow2" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "kNormal1" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "kNormal2" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # ------------------------------------------------------------- # Push (timestamp) the low priority txn using: @@ -177,17 +177,17 @@ debug-lock-table ---- num=6 lock: "kHigh1" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "kHigh2" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "kLow1" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl [(str: Exclusive seq: 0)] lock: "kLow2" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "kNormal1" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "kNormal2" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # ------------------------------------------------------------- # Push (abort) the low priority txn using: @@ -255,15 +255,15 @@ debug-lock-table ---- num=5 lock: "kHigh1" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "kHigh2" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "kLow1" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl seqs: [0] [holder finalized: aborted] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl [(str: Exclusive seq: 0)] [holder finalized: aborted] lock: "kNormal1" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "kNormal2" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # ------------------------------------------------------------- # Push (timestamp) the normal priority txn using: @@ -325,15 +325,15 @@ debug-lock-table ---- num=5 lock: "kHigh1" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "kHigh2" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "kLow1" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl seqs: [0] [holder finalized: aborted] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl [(str: Exclusive seq: 0)] [holder finalized: aborted] lock: "kNormal1" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl [(str: Exclusive seq: 0)] lock: "kNormal2" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # ------------------------------------------------------------- # Push (abort) the normal priority txn using: @@ -401,13 +401,13 @@ debug-lock-table ---- num=4 lock: "kHigh1" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "kHigh2" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "kLow1" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl seqs: [0] [holder finalized: aborted] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl [(str: Exclusive seq: 0)] [holder finalized: aborted] lock: "kNormal1" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl seqs: [0] [holder finalized: aborted] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl [(str: Exclusive seq: 0)] [holder finalized: aborted] # ------------------------------------------------------------- # Push (timestamp) the high priority txn using: @@ -473,13 +473,13 @@ debug-lock-table ---- num=4 lock: "kHigh1" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl [(str: Exclusive seq: 0)] lock: "kHigh2" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "kLow1" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl seqs: [0] [holder finalized: aborted] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl [(str: Exclusive seq: 0)] [holder finalized: aborted] lock: "kNormal1" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl seqs: [0] [holder finalized: aborted] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl [(str: Exclusive seq: 0)] [holder finalized: aborted] # ------------------------------------------------------------- # Push (abort) the high priority txn using: @@ -549,11 +549,11 @@ debug-lock-table ---- num=3 lock: "kHigh1" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl seqs: [0] [holder finalized: committed] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl [(str: Exclusive seq: 0)] [holder finalized: committed] lock: "kLow1" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl seqs: [0] [holder finalized: aborted] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl [(str: Exclusive seq: 0)] [holder finalized: aborted] lock: "kNormal1" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl seqs: [0] [holder finalized: aborted] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl [(str: Exclusive seq: 0)] [holder finalized: aborted] # ------------------------------------------------------------- # Scan across keyspace to clear out all aborted locks. diff --git a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/queue_length_exceeded b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/queue_length_exceeded index 5b10bd2ca329..1b283ad21f22 100644 --- a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/queue_length_exceeded +++ b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/queue_length_exceeded @@ -89,7 +89,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 2, txn: 00000002-0000-0000-0000-000000000000 active: true req: 3, txn: 00000003-0000-0000-0000-000000000000 @@ -169,7 +169,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 3, txn: 00000003-0000-0000-0000-000000000000 active: true req: 4, txn: 00000004-0000-0000-0000-000000000000 diff --git a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/range_state_listener b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/range_state_listener index ec4883d20e7f..703fae025636 100644 --- a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/range_state_listener +++ b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/range_state_listener @@ -79,9 +79,9 @@ debug-lock-table ---- num=2 lock: "k" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "k2" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # -------------------------------- # Setup complete, test starts here @@ -101,12 +101,12 @@ debug-lock-table ---- num=2 lock: "k" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 2, txn: 00000002-0000-0000-0000-000000000000 distinguished req: 2 lock: "k2" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # Replica loses lease. on-lease-updated leaseholder=false lease-seq=2 @@ -223,7 +223,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] finish req=req2 ---- @@ -333,7 +333,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000003-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] finish req=req3 ---- @@ -390,7 +390,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # -------------------------------- # Setup complete, test starts here @@ -410,7 +410,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 6, txn: 00000002-0000-0000-0000-000000000000 distinguished req: 6 @@ -491,7 +491,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] finish req=req2 ---- @@ -562,7 +562,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # -------------------------------- # Setup complete, test starts here @@ -589,7 +589,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 8, txn: 00000002-0000-0000-0000-000000000000 distinguished req: 8 @@ -711,7 +711,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] finish req=req2 ---- @@ -768,7 +768,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # -------------------------------- # Setup complete, test starts here @@ -788,7 +788,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 12, txn: 00000002-0000-0000-0000-000000000000 distinguished req: 12 @@ -869,7 +869,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] finish req=req2 ---- diff --git a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/resolve_pushed_intents b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/resolve_pushed_intents index 07c74532ca4c..b370a2db754b 100644 --- a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/resolve_pushed_intents +++ b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/resolve_pushed_intents @@ -204,9 +204,9 @@ num=4 lock: "b" holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl lock: "g" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "h" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] sequence req=req1 ---- @@ -235,9 +235,9 @@ debug-lock-table ---- num=2 lock: "g" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl [(str: Exclusive seq: 0)] lock: "h" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl [(str: Exclusive seq: 0)] reset namespace ---- diff --git a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/update b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/update index 99debf20b94d..1999b770468b 100644 --- a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/update +++ b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/update @@ -58,7 +58,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] waiting readers: req: 2, txn: 00000002-0000-0000-0000-000000000000 distinguished req: 2 @@ -85,7 +85,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 12.000000000,2, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 12.000000000,2, info: unrepl [(str: Exclusive seq: 0)] # Issue another write to the same key for txn1 at its initial # timestamp. The timestamp in the lock table does not regress. @@ -113,7 +113,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 12.000000000,2, info: unrepl seqs: [0, 1] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 12.000000000,2, info: unrepl [(str: Exclusive seq: 0)] reset namespace ---- @@ -177,7 +177,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] waiting readers: req: 5, txn: 00000002-0000-0000-0000-000000000000 distinguished req: 5 @@ -204,7 +204,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 12.000000000,2, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 12.000000000,2, info: unrepl [(str: Exclusive seq: 0)] # The txn restarts at a new timestamp, but below the pushed # timestamp. It re-issues the same write at the new epoch. The @@ -236,7 +236,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 1, iso: Serializable, ts: 12.000000000,2, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 1, iso: Serializable, ts: 12.000000000,2, info: unrepl [(str: Exclusive seq: 0)] reset namespace ---- @@ -305,7 +305,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] waiting readers: req: 8, txn: 00000002-0000-0000-0000-000000000000 distinguished req: 8 @@ -332,7 +332,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 12.000000000,2, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 12.000000000,2, info: unrepl [(str: Exclusive seq: 0)] # Issue another write to the same key for txn1 at its initial timestamp, # this time with a replicated durability. The timestamp in the lock @@ -381,7 +381,7 @@ debug-lock-table ---- num=1 lock: "k" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl, unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl, unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 9, txn: none distinguished req: 9 diff --git a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/wait_policy_error b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/wait_policy_error index 0479892fc7c1..a7b75b8fbd1c 100644 --- a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/wait_policy_error +++ b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/wait_policy_error @@ -79,14 +79,14 @@ debug-lock-table ---- num=3 lock: "k" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "k2" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 3, txn: 00000003-0000-0000-0000-000000000000 distinguished req: 3 lock: "k3" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] # ------------------------------------------------------------- # Read-only request with WaitPolicy_Error hits lock. The request @@ -145,7 +145,7 @@ num=2 queued writers: active: false req: 3, txn: 00000003-0000-0000-0000-000000000000 lock: "k3" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 3, txn: 00000003-0000-0000-0000-000000000000 distinguished req: 3 @@ -210,7 +210,7 @@ num=3 queued writers: active: false req: 3, txn: 00000003-0000-0000-0000-000000000000 lock: "k3" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 3, txn: 00000003-0000-0000-0000-000000000000 distinguished req: 3 diff --git a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/wait_policy_skip b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/wait_policy_skip index cb123605e8e9..01c31d9174af 100644 --- a/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/wait_policy_skip +++ b/pkg/kv/kvserver/concurrency/testdata/concurrency_manager/wait_policy_skip @@ -107,11 +107,11 @@ debug-lock-table ---- num=4 lock: "k" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "k2" - holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000001-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "k3" - holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000002-0000-0000-0000-000000000000 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "k4" queued writers: active: false req: 4, txn: 00000004-0000-0000-0000-000000000000 diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/acquire_idempotency b/pkg/kv/kvserver/concurrency/testdata/lock_table/acquire_idempotency index 10cb2e9b9ab0..6116475d7279 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/acquire_idempotency +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/acquire_idempotency @@ -25,13 +25,13 @@ acquire r=req1 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [1] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 1)] dequeue r=req1 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [1] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 1)] new-txn txn=txn1 ts=10,1 epoch=0 seq=2 ---- @@ -47,13 +47,13 @@ acquire r=req2 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [1, 2] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 1)] dequeue r=req2 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [1, 2] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 1)] new-txn txn=txn1 ts=10,1 epoch=0 seq=4 ---- @@ -69,13 +69,13 @@ acquire r=req3 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [1, 2, 4] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 1)] dequeue r=req3 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [1, 2, 4] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 1)] # ------------------------------------------------------------- # Re-Acquire lock with sequence number 4 @@ -95,13 +95,13 @@ acquire r=req3 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [1, 2, 4] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 1)] dequeue r=req3 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [1, 2, 4] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 1)] # ------------------------------------------------------------- # Re-Acquire lock with sequence number 2 @@ -121,13 +121,13 @@ acquire r=req4 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [1, 2, 4] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 1)] dequeue r=req4 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [1, 2, 4] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 1)] # ------------------------------------------------------------- # Try to acquire lock with sequence number 3. Should update the @@ -149,13 +149,13 @@ acquire r=req5 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [1, 2, 3, 4] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 1)] dequeue r=req5 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [1, 2, 3, 4] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 1)] # ------------------------------------------------------------- # Acquire lock with sequence numbers 5 @@ -175,10 +175,10 @@ acquire r=req6 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [1, 2, 3, 4, 5] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 1)] dequeue r=req6 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [1, 2, 3, 4, 5] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 1)] diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/acquire_ignored_seqs b/pkg/kv/kvserver/concurrency/testdata/lock_table/acquire_ignored_seqs index e5c56a274141..93f13c4a7f29 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/acquire_ignored_seqs +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/acquire_ignored_seqs @@ -35,19 +35,19 @@ acquire r=req1 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [1] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 1)] acquire r=req2 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [1, 2] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 1)] acquire r=req3 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [1, 2, 3] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 1)] # ------------------------------------------------------------------------------ @@ -65,7 +65,7 @@ acquire r=req4 k=a durability=u ignored-seqs=2,3 strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [1, 5] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 1)] # ------------------------------------------------------------------------------ # Re-acquire the (unreplicated) lock at a higher sequence number. This time, @@ -82,7 +82,7 @@ acquire r=req5 k=a durability=u ignored-seqs=4 strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [1, 5, 8] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 1)] # ------------------------------------------------------------------------------ # Ensure sequence numbers get pruned when acquiring replicated locks, and the @@ -115,7 +115,7 @@ acquire r=req7 k=a durability=r ignored-seqs=8 strength=intent ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl, unrepl seqs: [1, 5, 8] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl, unrepl [(str: Exclusive seq: 1)] queued writers: active: true req: 3, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 3 @@ -129,7 +129,7 @@ acquire r=req8 k=a durability=u ignored-seqs=8 strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl, unrepl seqs: [1, 5, 9] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl, unrepl [(str: Exclusive seq: 1)] queued writers: active: true req: 3, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 3 @@ -148,7 +148,7 @@ acquire r=req9 k=a durability=u ignored-seqs=1,5-9 strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl, unrepl seqs: [11] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl, unrepl [(str: Exclusive seq: 11)] queued writers: active: true req: 3, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 3 diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/add_discovered b/pkg/kv/kvserver/concurrency/testdata/lock_table/add_discovered index 38c2038d7b8e..b845dc1d3ea2 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/add_discovered +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/add_discovered @@ -42,13 +42,13 @@ acquire r=req1 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req1 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] new-request r=req2 txn=txn2 ts=10,1 spans=intent@a ---- diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/basic b/pkg/kv/kvserver/concurrency/testdata/lock_table/basic index d7aeaca3552e..f249ab1ef0c2 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/basic +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/basic @@ -27,7 +27,7 @@ acquire r=req1 k=c durability=u strength=exclusive ---- num=1 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] acquire r=req1 k=e durability=u strength=exclusive num=2 @@ -40,9 +40,9 @@ dequeue r=req1 ---- num=2 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # 200ms passes between req1 and req2 time-tick ms=200 @@ -61,21 +61,21 @@ acquire r=req2 k=b durability=u strength=exclusive ---- num=3 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req2 ---- num=3 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # 1s passes before txn2 begins time-tick s=1 @@ -99,11 +99,11 @@ dequeue r=req3 ---- num=3 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # 200ms passes between req3 and req4 time-tick ms=200 @@ -137,9 +137,9 @@ num=3 queued writers: active: false req: 4, txn: 00000000-0000-0000-0000-000000000002 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # Still waiting, but on lock c which has a different ts in the TxnMeta. @@ -162,7 +162,7 @@ num=3 queued writers: active: false req: 4, txn: 00000000-0000-0000-0000-000000000002 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # No longer waiting since does not conflict with lock on e. @@ -196,7 +196,7 @@ num=4 queued writers: active: false req: 4, txn: 00000000-0000-0000-0000-000000000002 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] add-discovered r=req4 k=f txn=txn3 ---- @@ -212,7 +212,7 @@ num=5 queued writers: active: false req: 4, txn: 00000000-0000-0000-0000-000000000002 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "f" holder: txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, ts: 6.000000000,0, info: repl @@ -264,7 +264,7 @@ num=5 queued writers: active: false req: 4, txn: 00000000-0000-0000-0000-000000000002 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "f" holder: txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, ts: 6.000000000,0, info: repl @@ -402,7 +402,7 @@ num=5 queued writers: active: false req: 4, txn: 00000000-0000-0000-0000-000000000002 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "f" holder: txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, ts: 6.000000000,0, info: repl @@ -452,7 +452,7 @@ num=5 queued writers: active: false req: 4, txn: 00000000-0000-0000-0000-000000000002 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "f" holder: txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, ts: 6.000000000,0, info: repl @@ -609,7 +609,7 @@ num=5 active: true req: 7, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 7 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "f" holder: txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, ts: 6.000000000,0, info: repl @@ -749,7 +749,7 @@ num=5 active: true req: 7, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 7 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "f" holder: txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, ts: 6.000000000,0, info: repl @@ -778,7 +778,7 @@ num=5 active: true req: 7, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 7 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "f" holder: txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, ts: 6.000000000,0, info: repl waiting readers: @@ -921,7 +921,7 @@ num=4 active: true req: 7, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 7 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] guard-state r=req4 ---- @@ -964,7 +964,7 @@ num=4 active: true req: 7, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 7 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] acquire r=req4 k=c durability=r strength=intent ---- @@ -983,7 +983,7 @@ num=4 active: true req: 7, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 7 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] guard-state r=req6 ---- @@ -1010,7 +1010,7 @@ num=4 active: true req: 7, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 7 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] metrics ---- @@ -1122,7 +1122,7 @@ num=3 active: true req: 7, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 7 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # Locks: # a b c d e f g @@ -1156,7 +1156,7 @@ num=3 queued writers: active: false req: 7, txn: 00000000-0000-0000-0000-000000000003 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] guard-state r=req7 ---- @@ -1178,7 +1178,7 @@ num=3 queued writers: active: false req: 7, txn: 00000000-0000-0000-0000-000000000003 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] metrics ---- @@ -1291,7 +1291,7 @@ num=3 queued writers: active: false req: 7, txn: 00000000-0000-0000-0000-000000000003 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] guard-state r=req6 ---- @@ -1328,7 +1328,7 @@ num=3 active: false req: 6, txn: 00000000-0000-0000-0000-000000000001 active: false req: 7, txn: 00000000-0000-0000-0000-000000000003 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] metrics ---- @@ -1442,7 +1442,7 @@ num=2 queued writers: active: false req: 7, txn: 00000000-0000-0000-0000-000000000003 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] guard-state r=req7 ---- @@ -1456,7 +1456,7 @@ dequeue r=req7 ---- num=1 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # e is still locked @@ -1480,7 +1480,7 @@ dequeue r=req8 ---- num=1 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # 100ms passes between before releasing c-f time-tick ms=100 @@ -1596,19 +1596,19 @@ acquire r=req9 k=c durability=u strength=exclusive ---- num=1 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req9 ---- num=1 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] print ---- num=1 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] metrics ---- @@ -1735,7 +1735,7 @@ print ---- num=1 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 10, txn: 00000000-0000-0000-0000-000000000002 active: true req: 11, txn: 00000000-0000-0000-0000-000000000003 @@ -1961,7 +1961,7 @@ acquire r=req10 k=c durability=u strength=exclusive ---- num=1 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 8.000000000,12, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 8.000000000,12, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 11, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 11 @@ -1979,7 +1979,7 @@ print ---- num=1 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 8.000000000,12, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 8.000000000,12, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 11, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 11 @@ -2078,7 +2078,7 @@ dequeue r=req10 ---- num=1 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 8.000000000,12, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 8.000000000,12, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 11, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 11 @@ -2087,7 +2087,7 @@ acquire r=req12 k=c durability=r strength=intent ---- num=1 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 8.000000000,12, info: repl, unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 8.000000000,12, info: repl, unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 11, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 11 @@ -2096,7 +2096,7 @@ dequeue r=req12 ---- num=1 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 8.000000000,12, info: repl, unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 8.000000000,12, info: repl, unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 11, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 11 @@ -2230,7 +2230,7 @@ acquire r=req13 k=c durability=u strength=exclusive ---- num=1 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 8.000000000,12, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 8.000000000,12, info: unrepl [(str: Exclusive seq: 0)] new-request r=req14 txn=txn1 ts=9,0 spans=intent@c ---- @@ -2381,23 +2381,23 @@ acquire r=req17 k=c durability=u strength=exclusive ---- num=1 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 9.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 9.000000000,0, info: unrepl [(str: Exclusive seq: 0)] acquire r=req17 k=d durability=u strength=exclusive ---- num=2 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 9.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 9.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 9.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 9.000000000,0, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req17 ---- num=2 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 9.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 9.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 9.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 9.000000000,0, info: unrepl [(str: Exclusive seq: 0)] new-request r=req18 txn=txn2 ts=10,0 spans=exclusive@c+exclusive@d ---- @@ -2417,12 +2417,12 @@ print ---- num=2 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 9.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 9.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 18, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 18 lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 9.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 9.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 19, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 19 @@ -2527,7 +2527,7 @@ num=2 queued writers: active: false req: 18, txn: 00000000-0000-0000-0000-000000000002 lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 9.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 9.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 19, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 19 @@ -2543,7 +2543,7 @@ num=2 queued writers: active: false req: 18, txn: 00000000-0000-0000-0000-000000000002 lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 9.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 9.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 18, txn: 00000000-0000-0000-0000-000000000002 active: true req: 19, txn: 00000000-0000-0000-0000-000000000002 @@ -2663,7 +2663,7 @@ num=2 queued writers: active: false req: 18, txn: 00000000-0000-0000-0000-000000000002 lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] guard-state r=req19 ---- @@ -2677,13 +2677,13 @@ dequeue r=req18 ---- num=1 lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req19 ---- num=1 lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] release txn=txn2 span=d ---- @@ -2703,13 +2703,13 @@ acquire r=req20 k=c durability=u strength=exclusive ---- num=1 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req20 ---- num=1 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] new-request r=req21 txn=txn1 ts=10 spans=exclusive@d ---- @@ -2722,17 +2722,17 @@ acquire r=req21 k=d durability=u strength=exclusive ---- num=2 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req21 ---- num=2 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] new-request r=req22 txn=txn2 ts=10 spans=intent@c+intent@d ---- @@ -2745,12 +2745,12 @@ print ---- num=2 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 22, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 22 lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] metrics ---- @@ -2854,7 +2854,7 @@ release txn=txn1 span=d ---- num=2 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 22, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 22 @@ -2998,7 +2998,7 @@ num=2 queued writers: active: false req: 22, txn: 00000000-0000-0000-0000-000000000002 lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: false req: 22, txn: 00000000-0000-0000-0000-000000000002 @@ -3006,13 +3006,13 @@ dequeue r=req22 ---- num=1 lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req23 ---- num=1 lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] release txn=txn3 span=d ---- diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/clear b/pkg/kv/kvserver/concurrency/testdata/lock_table/clear index a5b2d014e178..fdf2c2778166 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/clear +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/clear @@ -29,23 +29,23 @@ acquire r=req1 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] acquire r=req1 k=b durability=u strength=exclusive ---- num=2 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req1 ---- num=2 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # In its next request, txn1 discovers a lock at c held by txn2. @@ -64,9 +64,9 @@ add-discovered r=req2 k=c txn=txn2 ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "c" holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 8.000000000,1, info: repl @@ -113,14 +113,14 @@ print ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] waiting readers: req: 3, txn: none queued writers: active: true req: 4, txn: none distinguished req: 3 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 5, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 5 diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/clear_finalized_txn_locks b/pkg/kv/kvserver/concurrency/testdata/lock_table/clear_finalized_txn_locks index 794fe275c1d0..bcb3cac71b3b 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/clear_finalized_txn_locks +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/clear_finalized_txn_locks @@ -115,7 +115,7 @@ num=5 queued writers: active: false req: 1, txn: 00000000-0000-0000-0000-000000000001 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000004 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000004 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "d" holder: txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: repl queued writers: @@ -137,7 +137,7 @@ num=5 queued writers: active: false req: 1, txn: 00000000-0000-0000-0000-000000000001 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000004 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000004 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "d" holder: txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: repl queued writers: @@ -164,7 +164,7 @@ num=5 queued writers: active: false req: 1, txn: 00000000-0000-0000-0000-000000000001 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000004 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000004 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "d" holder: txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: repl queued writers: @@ -197,7 +197,7 @@ num=5 queued writers: active: false req: 1, txn: 00000000-0000-0000-0000-000000000001 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000004 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000004 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 1, txn: 00000000-0000-0000-0000-000000000001 distinguished req: 1 @@ -323,7 +323,7 @@ num=3 queued writers: active: false req: 3, txn: 00000000-0000-0000-0000-000000000001 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "c" holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: repl queued writers: @@ -337,7 +337,7 @@ num=3 queued writers: active: false req: 3, txn: 00000000-0000-0000-0000-000000000001 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "c" holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: repl queued writers: @@ -837,67 +837,67 @@ acquire r=req13 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] acquire r=req13 k=b durability=u strength=exclusive ---- num=2 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] acquire r=req13 k=c durability=u strength=exclusive ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] acquire r=req13 k=d durability=u strength=exclusive ---- num=4 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] acquire r=req13 k=e durability=u strength=exclusive ---- num=5 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] acquire r=req13 k=f durability=u strength=exclusive ---- num=6 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "f" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] pushed-txn-updated txn=txn6 status=aborted ---- @@ -924,13 +924,13 @@ num=6 queued writers: active: false req: 13, txn: 00000000-0000-0000-0000-000000000005 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] [holder finalized: aborted] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] [holder finalized: aborted] lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] [holder finalized: aborted] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] [holder finalized: aborted] lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] [holder finalized: aborted] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] [holder finalized: aborted] lock: "f" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] [holder finalized: aborted] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] [holder finalized: aborted] scan r=req15 ---- @@ -950,9 +950,9 @@ num=4 queued writers: active: false req: 13, txn: 00000000-0000-0000-0000-000000000005 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] [holder finalized: aborted] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] [holder finalized: aborted] lock: "f" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] [holder finalized: aborted] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] [holder finalized: aborted] print ---- @@ -964,9 +964,9 @@ num=4 queued writers: active: false req: 13, txn: 00000000-0000-0000-0000-000000000005 lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] [holder finalized: aborted] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] [holder finalized: aborted] lock: "f" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl seqs: [0] [holder finalized: aborted] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 11.000000000,0, info: unrepl [(str: Exclusive seq: 0)] [holder finalized: aborted] scan r=req16 ---- diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/disable b/pkg/kv/kvserver/concurrency/testdata/lock_table/disable index 5776dbb9ca3e..736bc17bdee7 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/disable +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/disable @@ -103,10 +103,10 @@ num=2 queued writers: active: false req: 2, txn: 00000000-0000-0000-0000-000000000001 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req2 ---- num=1 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/dup_access b/pkg/kv/kvserver/concurrency/testdata/lock_table/dup_access index 53c67b65b157..baea0d99894a 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/dup_access +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/dup_access @@ -28,13 +28,13 @@ acquire r=req1 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 seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req1 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] new-request r=req2 txn=txn2 ts=10 spans=intent@a+none@a ---- @@ -51,7 +51,7 @@ print ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 2, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 2 @@ -87,35 +87,35 @@ acquire r=req3 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 seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] acquire r=req3 k=b durability=u strength=exclusive ---- num=2 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] acquire r=req3 k=c durability=u strength=exclusive ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req3 ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] new-request r=req4 txn=txn2 ts=10 spans=intent@a+intent@b ---- @@ -143,17 +143,17 @@ print ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 4, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 4 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 5, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 5 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] # req5 reserves "b" and waits at "c". @@ -161,7 +161,7 @@ release txn=txn1 span=b ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 4, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 4 @@ -169,7 +169,7 @@ num=3 queued writers: active: false req: 5, txn: 00000000-0000-0000-0000-000000000003 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] guard-state r=req5 ---- @@ -179,7 +179,7 @@ print ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 4, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 4 @@ -187,7 +187,7 @@ num=3 queued writers: active: false req: 5, txn: 00000000-0000-0000-0000-000000000003 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 5, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 5 @@ -204,7 +204,7 @@ num=3 queued writers: active: false req: 5, txn: 00000000-0000-0000-0000-000000000003 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 5, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 5 @@ -224,7 +224,7 @@ num=3 active: false req: 4, txn: 00000000-0000-0000-0000-000000000002 active: false req: 5, txn: 00000000-0000-0000-0000-000000000003 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 5, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 5 @@ -304,35 +304,35 @@ acquire r=req6 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 seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] acquire r=req6 k=b durability=u strength=exclusive ---- num=2 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] acquire r=req6 k=c durability=u strength=exclusive strength=exclusive ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req6 ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] new-request r=req7 txn=txn2 ts=10 spans=exclusive@a+exclusive@b ---- @@ -374,18 +374,18 @@ print ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 7, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 7 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 8, txn: none active: true req: 9, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 8 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] # req8 waits at "c". @@ -393,7 +393,7 @@ release txn=txn1 span=b ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 7, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 7 @@ -401,7 +401,7 @@ num=3 queued writers: active: false req: 9, txn: 00000000-0000-0000-0000-000000000002 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] guard-state r=req8 ---- @@ -411,7 +411,7 @@ print ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 7, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 7 @@ -419,7 +419,7 @@ num=3 queued writers: active: false req: 9, txn: 00000000-0000-0000-0000-000000000002 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 8, txn: none distinguished req: 8 @@ -436,7 +436,7 @@ num=3 queued writers: active: false req: 9, txn: 00000000-0000-0000-0000-000000000002 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 8, txn: none distinguished req: 8 @@ -456,7 +456,7 @@ num=3 active: false req: 7, txn: 00000000-0000-0000-0000-000000000002 active: false req: 9, txn: 00000000-0000-0000-0000-000000000002 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 8, txn: none distinguished req: 8 @@ -472,9 +472,9 @@ num=3 queued writers: active: false req: 7, txn: 00000000-0000-0000-0000-000000000002 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 8, txn: none distinguished req: 8 @@ -487,7 +487,7 @@ num=2 queued writers: active: false req: 7, txn: 00000000-0000-0000-0000-000000000002 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] guard-state r=req8 ---- @@ -500,7 +500,7 @@ num=2 queued writers: active: false req: 7, txn: 00000000-0000-0000-0000-000000000002 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] waiting readers: req: 8, txn: none distinguished req: 8 @@ -509,7 +509,7 @@ dequeue r=req7 ---- num=1 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] waiting readers: req: 8, txn: none distinguished req: 8 @@ -518,7 +518,7 @@ dequeue r=req8 ---- num=1 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] release txn=txn2 span=b ---- @@ -541,23 +541,23 @@ acquire r=req10 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 seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] acquire r=req10 k=b durability=u strength=exclusive ---- num=2 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req10 ---- num=2 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] new-request r=req11 txn=txn2 ts=10 spans=exclusive@a+exclusive@b ---- @@ -585,12 +585,12 @@ print ---- num=2 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 11, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 11 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 12, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 12 @@ -601,7 +601,7 @@ release txn=txn1 span=b ---- num=2 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 11, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 11 @@ -647,7 +647,7 @@ num=2 queued writers: active: false req: 11, txn: 00000000-0000-0000-0000-000000000002 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: false req: 12, txn: 00000000-0000-0000-0000-000000000003 @@ -670,7 +670,7 @@ dequeue r=req11 ---- num=1 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 12, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 12 @@ -679,7 +679,7 @@ dequeue r=req12 ---- num=1 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] release txn=txn2 span=b ----- diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/isolation_level b/pkg/kv/kvserver/concurrency/testdata/lock_table/isolation_level index 704f71a3ce6e..322ac000884f 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/isolation_level +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/isolation_level @@ -31,7 +31,7 @@ acquire r=req1 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: ReadCommitted, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: ReadCommitted, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] new-request r=req2 txn=txn3 ts=10,1 spans=exclusive@b ---- @@ -40,15 +40,15 @@ acquire r=req1 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: ReadCommitted, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: ReadCommitted, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] acquire r=req2 k=b durability=u strength=exclusive ---- num=2 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: ReadCommitted, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: ReadCommitted, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] new-request r=req3 txn=txn4 ts=10,1 spans=exclusive@c ---- @@ -57,11 +57,11 @@ acquire r=req3 k=c durability=u strength=exclusive ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: ReadCommitted, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: ReadCommitted, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000003 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000004 epoch: 0, iso: Snapshot, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000004 epoch: 0, iso: Snapshot, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # A non-locking read from a RC transaction should not wait. new-request r=req4 txn=txn1 ts=10,1 spans=none@a,d @@ -153,7 +153,7 @@ acquire r=req8 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: ReadCommitted, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: ReadCommitted, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # Snapshot txn. new-request r=req9 txn=txn5 ts=10,1 spans=exclusive@b @@ -163,9 +163,9 @@ acquire r=req9 k=b durability=u strength=exclusive ---- num=2 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: ReadCommitted, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: ReadCommitted, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000005 epoch: 0, iso: Snapshot, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000005 epoch: 0, iso: Snapshot, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # Non-locking read from a serializable transaction. new-request r=req10 txn=txn2 ts=10,1 spans=none@a diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/lock_changes b/pkg/kv/kvserver/concurrency/testdata/lock_table/lock_changes index 1af8fd3a7422..3ad3541bde5f 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/lock_changes +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/lock_changes @@ -20,13 +20,13 @@ acquire r=req1 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 seqs: [2] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 2)] release txn=txn2 span=a,c ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [2] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 2)] # --------------------------------------------------------------------------------- # Lock is reacquired at same epoch with lower timestamp. This is allowed, @@ -44,7 +44,7 @@ acquire r=req2 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 seqs: [2, 3] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 2)] # --------------------------------------------------------------------------------- # Lock is reacquired at same epoch with lower timestamp and different durability. @@ -66,7 +66,7 @@ acquire r=req2 k=a durability=r strength=intent ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 8.000000000,0, info: repl, unrepl seqs: [2, 3] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 8.000000000,0, info: repl, unrepl [(str: Exclusive seq: 2)] queued writers: active: true req: 1, txn: none distinguished req: 1 @@ -75,7 +75,7 @@ dequeue r=reqContend ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 8.000000000,0, info: repl, unrepl seqs: [2, 3] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 8.000000000,0, info: repl, unrepl [(str: Exclusive seq: 2)] # --------------------------------------------------------------------------------- # Lock is reacquired at a different epoch. The old sequence numbers are discarded. @@ -91,7 +91,7 @@ acquire r=req3 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 8.000000000,0, info: repl, unrepl seqs: [1] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 8.000000000,0, info: repl, unrepl [(str: Exclusive seq: 1)] # --------------------------------------------------------------------------------- # Lock is reacquired at a different epoch with lower timestamp. This is allowed, @@ -109,7 +109,7 @@ acquire r=req4 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 2, iso: Serializable, ts: 8.000000000,0, info: repl, unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 2, iso: Serializable, ts: 8.000000000,0, info: repl, unrepl [(str: Exclusive seq: 0)] # --------------------------------------------------------------------------------- # Reader waits until the timestamp of the lock is updated. @@ -130,7 +130,7 @@ print ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 2, iso: Serializable, ts: 8.000000000,0, info: repl, unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 2, iso: Serializable, ts: 8.000000000,0, info: repl, unrepl [(str: Exclusive seq: 0)] waiting readers: req: 2, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 2 @@ -145,7 +145,7 @@ acquire r=req6 k=a durability=r strength=intent ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 2, iso: Serializable, ts: 10.000000000,0, info: repl, unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 2, iso: Serializable, ts: 10.000000000,0, info: repl, unrepl [(str: Exclusive seq: 0)] waiting readers: req: 2, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 2 @@ -158,7 +158,7 @@ acquire r=req6 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 2, iso: Serializable, ts: 14.000000000,0, info: repl, unrepl seqs: [0, 1] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 2, iso: Serializable, ts: 14.000000000,0, info: repl, unrepl [(str: Exclusive seq: 0)] guard-state r=req5 ---- @@ -186,7 +186,7 @@ add-discovered r=req7 k=a txn=txn1 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 2, iso: Serializable, ts: 14.000000000,0, info: repl, unrepl seqs: [0, 1] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 2, iso: Serializable, ts: 14.000000000,0, info: repl, unrepl [(str: Exclusive seq: 0)] waiting readers: req: 3, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 3 @@ -206,7 +206,7 @@ print ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 2, iso: Serializable, ts: 14.000000000,0, info: repl, unrepl seqs: [0, 1] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 2, iso: Serializable, ts: 14.000000000,0, info: repl, unrepl [(str: Exclusive seq: 0)] waiting readers: req: 3, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 3 diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/lock_dropped b/pkg/kv/kvserver/concurrency/testdata/lock_table/lock_dropped index 08904f88965e..fcee5515db27 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/lock_dropped +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/lock_dropped @@ -26,7 +26,7 @@ acquire r=req1 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 seqs: [2] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 2)] acquire r=req1 k=a durability=r strength=intent ---- @@ -44,7 +44,7 @@ acquire r=req1 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 seqs: [2] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 2)] scan r=reqContendReader ---- @@ -54,7 +54,7 @@ print ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [2] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 2)] waiting readers: req: 1, txn: none distinguished req: 1 @@ -79,7 +79,7 @@ acquire r=req1 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 seqs: [2] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 2)] scan r=reqContendReader ---- @@ -93,7 +93,7 @@ print ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [2] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 2)] waiting readers: req: 1, txn: none queued writers: @@ -104,7 +104,7 @@ acquire r=req1 k=a durability=r strength=intent ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: repl, unrepl seqs: [2] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: repl, unrepl [(str: Exclusive seq: 2)] waiting readers: req: 1, txn: none queued writers: @@ -139,7 +139,7 @@ acquire r=req1 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 seqs: [2] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 2)] new-txn txn=txn2 ts=10 epoch=0 seq=0 ---- @@ -151,9 +151,9 @@ acquire r=req2 k=b durability=u strength=exclusive ---- num=2 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [2] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 2)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] new-request r=req3 txn=none ts=10 spans=none@a,c ---- @@ -170,7 +170,7 @@ acquire r=req2 k=b durability=r strength=intent ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [2] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 2)] waiting readers: req: 3, txn: none distinguished req: 3 diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/non_txn_write b/pkg/kv/kvserver/concurrency/testdata/lock_table/non_txn_write index ca3b9b8bd1c4..5014ce6b0983 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/non_txn_write +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/non_txn_write @@ -22,35 +22,35 @@ acquire r=req1 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 seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] acquire r=req1 k=b durability=u strength=exclusive ---- num=2 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] acquire r=req1 k=c durability=u strength=exclusive ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req1 ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] # Next, two different transactional requests wait at a and b. new-request r=req2 txn=txn2 ts=10 spans=intent@a @@ -89,18 +89,18 @@ print ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 2, txn: 00000000-0000-0000-0000-000000000002 active: true req: 4, txn: none distinguished req: 2 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 3, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 3 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 5, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 5 diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/optimistic b/pkg/kv/kvserver/concurrency/testdata/lock_table/optimistic index 898a24c62316..2dddf460b702 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/optimistic +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/optimistic @@ -24,23 +24,23 @@ acquire r=req1 k=c durability=u strength=exclusive ---- num=1 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] acquire r=req1 k=g durability=u strength=exclusive ---- num=2 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "g" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req1 ---- num=2 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "g" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] new-request r=req2 txn=txn2 ts=11,1 spans=none@a,d ---- @@ -57,9 +57,9 @@ dequeue r=req2 ---- num=2 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "g" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] new-request r=req3 txn=txn2 ts=11,1 spans=none@a,d+none@f,i ---- @@ -76,9 +76,9 @@ print ---- num=2 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "g" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] check-opt-no-conflicts r=req3 spans=none@a,c ---- @@ -100,9 +100,9 @@ dequeue r=req3 ---- num=2 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "g" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # --------------------------------------------------------------------------------- # Test with a Skip wait policy. Even though the lock table has a conflicting lock, @@ -129,6 +129,6 @@ dequeue r=req4 ---- num=2 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "g" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/query b/pkg/kv/kvserver/concurrency/testdata/lock_table/query index 011fc3212593..5d6059ffc05c 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/query +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/query @@ -21,23 +21,23 @@ acquire r=req1 k=c durability=u strength=exclusive ---- num=1 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] acquire r=req1 k=e durability=u strength=exclusive ---- num=2 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req1 ---- num=2 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] query span=a,d ---- @@ -62,21 +62,21 @@ acquire r=req2 k=b durability=u strength=exclusive ---- num=3 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req2 ---- num=3 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # make sure query limits work @@ -135,14 +135,14 @@ print ---- num=3 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,2, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 3, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 3 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "e" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 4, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 4 diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/queue_length_exceeded b/pkg/kv/kvserver/concurrency/testdata/lock_table/queue_length_exceeded index bae19dea9434..dadc349ca5a9 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/queue_length_exceeded +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/queue_length_exceeded @@ -27,7 +27,7 @@ acquire r=req1 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 seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] scan r=req2 ---- @@ -41,7 +41,7 @@ print ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 2, txn: 00000000-0000-0000-0000-000000000002 active: true req: 3, txn: 00000000-0000-0000-0000-000000000003 @@ -70,7 +70,7 @@ dequeue r=req4 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 2, txn: 00000000-0000-0000-0000-000000000002 active: true req: 3, txn: 00000000-0000-0000-0000-000000000003 @@ -98,7 +98,7 @@ dequeue r=req5 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 2, txn: 00000000-0000-0000-0000-000000000002 active: true req: 3, txn: 00000000-0000-0000-0000-000000000003 @@ -126,7 +126,7 @@ dequeue r=req6 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 2, txn: 00000000-0000-0000-0000-000000000002 active: true req: 3, txn: 00000000-0000-0000-0000-000000000003 @@ -151,7 +151,7 @@ dequeue r=req7 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 2, txn: 00000000-0000-0000-0000-000000000002 active: true req: 3, txn: 00000000-0000-0000-0000-000000000003 @@ -172,7 +172,7 @@ dequeue r=req8 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 2, txn: 00000000-0000-0000-0000-000000000002 active: true req: 3, txn: 00000000-0000-0000-0000-000000000003 @@ -199,13 +199,13 @@ acquire r=req9 k=b durability=u strength=exclusive ---- num=2 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 2, txn: 00000000-0000-0000-0000-000000000002 active: true req: 3, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 2 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] new-txn txn=txn7 ts=10 epoch=0 ---- @@ -225,13 +225,13 @@ print ---- num=2 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 2, txn: 00000000-0000-0000-0000-000000000002 active: true req: 3, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 2 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000006 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 10, txn: 00000000-0000-0000-0000-000000000007 distinguished req: 10 diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/resolve_pushed_txn_locks b/pkg/kv/kvserver/concurrency/testdata/lock_table/resolve_pushed_txn_locks index 48c67a1307f2..48456368a63e 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/resolve_pushed_txn_locks +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/resolve_pushed_txn_locks @@ -57,7 +57,7 @@ acquire r=reqLock k=a durability=u strength=exclusive ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "b" holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl lock: "c" @@ -67,9 +67,9 @@ acquire r=reqLock k=b durability=u strength=exclusive ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl, unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl, unrepl [(str: Exclusive seq: 0)] lock: "c" holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl @@ -77,9 +77,9 @@ dequeue r=reqLock ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl, unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl, unrepl [(str: Exclusive seq: 0)] lock: "c" holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl @@ -99,12 +99,12 @@ print ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] waiting readers: req: 3, txn: 00000000-0000-0000-0000-000000000001 distinguished req: 3 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl, unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl, unrepl [(str: Exclusive seq: 0)] waiting readers: req: 4, txn: 00000000-0000-0000-0000-000000000001 distinguished req: 4 @@ -125,9 +125,9 @@ print ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl, unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl, unrepl [(str: Exclusive seq: 0)] waiting readers: req: 4, txn: 00000000-0000-0000-0000-000000000001 distinguished req: 4 @@ -160,9 +160,9 @@ update txn=txn2 ts=11,1 epoch=0 span=b ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "c" holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: repl waiting readers: @@ -173,9 +173,9 @@ update txn=txn2 ts=11,1 epoch=0 span=c ---- num=2 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl [(str: Exclusive seq: 0)] guard-state r=req2 ---- diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/size_limit_exceeded b/pkg/kv/kvserver/concurrency/testdata/lock_table/size_limit_exceeded index 41b4a20e635a..4f28a773e1b4 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/size_limit_exceeded +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/size_limit_exceeded @@ -26,15 +26,15 @@ acquire r=req1 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 seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] acquire r=req1 k=b durability=u strength=exclusive ---- num=2 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] # c is first locked as unreplicated and establishes a writer queue # before being locked as replicated. We really only need it replicated @@ -47,11 +47,11 @@ acquire r=req1 k=c durability=u strength=exclusive ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] new-request r=reqContend txn=none ts=10 spans=intent@c ---- @@ -64,11 +64,11 @@ acquire r=req1 k=c durability=r strength=intent ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: repl, unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: repl, unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 2, txn: none distinguished req: 2 @@ -77,21 +77,21 @@ dequeue r=reqContend ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: repl, unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: repl, unrepl [(str: Exclusive seq: 0)] dequeue r=req1 ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: repl, unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: repl, unrepl [(str: Exclusive seq: 0)] new-request r=req2 txn=txn2 ts=10 spans=intent@a,c ---- @@ -111,15 +111,15 @@ print ---- num=3 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 3, txn: 00000000-0000-0000-0000-000000000002 active: true req: 4, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 3 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: repl, unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: repl, unrepl [(str: Exclusive seq: 0)] release txn=txn1 span=a ---- @@ -129,9 +129,9 @@ num=3 active: false req: 3, txn: 00000000-0000-0000-0000-000000000002 active: true req: 4, txn: 00000000-0000-0000-0000-000000000002 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: repl, unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: repl, unrepl [(str: Exclusive seq: 0)] guard-state r=req2 ---- @@ -149,12 +149,12 @@ num=3 active: false req: 3, txn: 00000000-0000-0000-0000-000000000002 active: true req: 4, txn: 00000000-0000-0000-0000-000000000002 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 3, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 3 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: repl, unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: repl, unrepl [(str: Exclusive seq: 0)] new-request r=req4 txn=txn2 ts=10 spans=none@b ---- @@ -196,7 +196,7 @@ num=4 active: false req: 3, txn: 00000000-0000-0000-0000-000000000002 active: true req: 4, txn: 00000000-0000-0000-0000-000000000002 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] waiting readers: req: 5, txn: 00000000-0000-0000-0000-000000000002 queued writers: @@ -204,7 +204,7 @@ num=4 active: true req: 6, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 3 lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: repl, unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: repl, unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 7, txn: 00000000-0000-0000-0000-000000000002 distinguished req: 7 diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/skip_locked b/pkg/kv/kvserver/concurrency/testdata/lock_table/skip_locked index a7fe1ba18933..be9cf1fd36e3 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/skip_locked +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/skip_locked @@ -30,23 +30,23 @@ acquire r=req1 k=b durability=u strength=exclusive ---- num=1 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] acquire r=req1 k=d durability=u strength=exclusive ---- num=2 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req1 ---- num=2 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] new-request r=req2 txn=txn2 ts=9,1 spans=exclusive@c+exclusive@f ---- @@ -63,35 +63,35 @@ acquire r=req2 k=c durability=u strength=exclusive ---- num=3 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 9.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 9.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] acquire r=req2 k=f durability=u strength=exclusive ---- num=4 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 9.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 9.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "f" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 9.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 9.000000000,1, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req2 ---- num=4 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 9.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 9.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "f" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 9.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 9.000000000,1, info: unrepl [(str: Exclusive seq: 0)] new-request r=req3 txn=txn1 ts=10,1 spans=intent@f ---- @@ -108,11 +108,11 @@ release txn=txn2 span=f ---- num=4 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 9.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 9.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "f" queued writers: active: false req: 3, txn: 00000000-0000-0000-0000-000000000001 @@ -186,11 +186,11 @@ dequeue r=req4 ---- num=4 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 9.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 9.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "f" queued writers: active: false req: 3, txn: 00000000-0000-0000-0000-000000000001 @@ -239,11 +239,11 @@ dequeue r=req5 ---- num=4 lock: "b" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "c" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 9.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 9.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "d" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] lock: "f" queued writers: active: false req: 3, txn: 00000000-0000-0000-0000-000000000001 diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/update b/pkg/kv/kvserver/concurrency/testdata/lock_table/update index ea3531aa8db5..d6c21f8194a5 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/update +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/update @@ -29,13 +29,13 @@ acquire r=req1 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req1 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] # ------------------------------------------------------------- # Wait on this lock as: @@ -93,7 +93,7 @@ print ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,1, info: unrepl [(str: Exclusive seq: 0)] waiting readers: req: 4, txn: none req: 2, txn: 00000000-0000-0000-0000-000000000002 @@ -200,7 +200,7 @@ update txn=txn1 ts=11,1 epoch=0 span=a ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 11.000000000,1, info: unrepl [(str: Exclusive seq: 0)] waiting readers: req: 4, txn: none req: 2, txn: 00000000-0000-0000-0000-000000000002 @@ -219,7 +219,7 @@ update txn=txn1 ts=13,1 epoch=0 span=a ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 13.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 13.000000000,1, info: unrepl [(str: Exclusive seq: 0)] waiting readers: req: 4, txn: none queued writers: @@ -239,7 +239,7 @@ dequeue r=req2 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 13.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 13.000000000,1, info: unrepl [(str: Exclusive seq: 0)] waiting readers: req: 4, txn: none queued writers: @@ -256,7 +256,7 @@ update txn=txn1 ts=10,1 epoch=0 span=a ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 13.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 13.000000000,1, info: unrepl [(str: Exclusive seq: 0)] waiting readers: req: 4, txn: none queued writers: @@ -272,7 +272,7 @@ update txn=txn1 ts=15,1 epoch=0 span=a ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 15.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 15.000000000,1, info: unrepl [(str: Exclusive seq: 0)] waiting readers: req: 4, txn: none queued writers: @@ -290,7 +290,7 @@ update txn=txn1 ts=17,1 epoch=0 span=a ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 17.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 17.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 3, txn: 00000000-0000-0000-0000-000000000003 active: true req: 5, txn: none @@ -308,7 +308,7 @@ dequeue r=req4 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 17.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 17.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 3, txn: 00000000-0000-0000-0000-000000000003 active: true req: 5, txn: none @@ -322,7 +322,7 @@ update txn=txn1 ts=19,1 epoch=0 span=a ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 19.000000000,1, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 19.000000000,1, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 3, txn: 00000000-0000-0000-0000-000000000003 active: true req: 5, txn: none @@ -393,7 +393,7 @@ acquire r=req1 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [1] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 1)] new-txn txn=txn1 ts=10 epoch=1 seq=5 ---- @@ -405,7 +405,7 @@ acquire r=req2 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [1, 5] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 1)] new-txn txn=txn1 ts=10 epoch=1 seq=7 ---- @@ -417,7 +417,7 @@ acquire r=req3 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [1, 5, 7] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 1)] new-txn txn=txn1 ts=10 epoch=1 seq=10 ---- @@ -429,7 +429,7 @@ acquire r=req4 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [1, 5, 7, 10] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 1)] # No seqnum change since lock is not held at seqnum 3, 8, 9. @@ -437,7 +437,7 @@ update txn=txn1 ts=10 epoch=1 span=a ignored-seqs=3,8-9 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [1, 5, 7, 10] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 1)] # No change since update is using older epoch. @@ -445,19 +445,19 @@ update txn=txn1 ts=10 epoch=0 span=a ignored-seqs=3,5-7 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [1, 5, 7, 10] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 1)] update txn=txn1 ts=10 epoch=1 span=a ignored-seqs=3,5-7 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [1, 10] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 1)] update txn=txn1 ts=10 epoch=1 span=a ignored-seqs=9-11 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [1] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 1)] # No seqnum change since update is using older epoch. But since the update is using # a higher timestamp, the ts is advanced. @@ -466,7 +466,7 @@ update txn=txn1 ts=15 epoch=0 span=a ignored-seqs=1 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 15.000000000,0, info: unrepl seqs: [1] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 15.000000000,0, info: unrepl [(str: Exclusive seq: 1)] # No change, since seqnum 3 is not held. Note that the ts is not updated. @@ -474,14 +474,14 @@ update txn=txn1 ts=10 epoch=1 span=a ignored-seqs=3 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 15.000000000,0, info: unrepl seqs: [1] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 15.000000000,0, info: unrepl [(str: Exclusive seq: 1)] # Timestamp is updated again. update txn=txn1 ts=16 epoch=1 span=a ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 16.000000000,0, info: unrepl seqs: [1] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 1, iso: Serializable, ts: 16.000000000,0, info: unrepl [(str: Exclusive seq: 1)] # Seqnum 1 is also ignored, so the lock is released. Note that it does not # matter that the update is using an older timestamp. diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/wait_self b/pkg/kv/kvserver/concurrency/testdata/lock_table/wait_self index fcef4653a423..8eb049834932 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/wait_self +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/wait_self @@ -37,13 +37,13 @@ acquire r=req1 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 seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] dequeue r=req1 ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] scan r=req2 ---- @@ -73,7 +73,7 @@ print ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000001 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 2, txn: 00000000-0000-0000-0000-000000000002 active: true req: 3, txn: 00000000-0000-0000-0000-000000000003 @@ -130,7 +130,7 @@ acquire r=req2 k=a durability=u strength=exclusive ---- num=1 lock: "a" - holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl seqs: [0] + holder: txn: 00000000-0000-0000-0000-000000000002 epoch: 0, iso: Serializable, ts: 10.000000000,0, info: unrepl [(str: Exclusive seq: 0)] queued writers: active: true req: 3, txn: 00000000-0000-0000-0000-000000000003 distinguished req: 3