Skip to content

Commit

Permalink
Merge #105383 #105641
Browse files Browse the repository at this point in the history 
105383: concurrency: split out replicated/unreplicated lock holder information r=nvanbenschoten a=arulajmani

The MVCC keyspace is the source of truth for replicated locks. We've
previously concluded that trying to keep the in-memory state of
replicated locks in sync is fraught with subtle issues. We instead do
the dumb thing and forget replicated locks in a few places (see comment
about mvccResolveWriteIntent in tryUpdateLockLocked). It follows that
we don't need to track as much information about replicated locks
(like we do for unreplicated locks). For example, we do not need to
track the sequence number history for replicated locks.

This patch splits out lock holder information about replicated locks and
unreplicated locks into 2 different structs. As mentioned above, we no
longer track seqeunce numbers for the former.

Informs #102270

Release note: None

105641: kvserver: deflake TestProtectedTimestamps r=irfansharif a=arulajmani

This patch fixes a few (hopefully all) issues with TestProtectedTimestamps. In particular,

- The range max bytes used by the test was broken after the lower bound was bumped in a37e053. We up the value.
- There was flakiness at various points in the test as a result of lease transfers. We change the test to run on a single node test cluster to get around this.

Fixes: #93497

Release note: None

Co-authored-by: Arul Ajmani <[email protected]>
  • Loading branch information
@arulajmani
craig[bot] and arulajmani committed Jun 27, 2023
3 parents bdf2a64 + ca5a959 + 0147fcc commit 3c2d5a4
Show file tree
Hide file tree
Showing 29 changed files with 585 additions and 486 deletions.
5 changes: 2 additions & 3 deletions pkg/kv/kvserver/client_protectedts_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ import (
func TestProtectedTimestamps(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)
skip.WithIssue(t, 93497, "flaky test")
ctx := context.Background()

// This test is too slow to run with race.
Expand All @@ -59,7 +58,7 @@ func TestProtectedTimestamps(t *testing.T) {
DisableGCQueue: true,
DisableLastProcessedCheck: true,
}
tc := testcluster.StartTestCluster(t, 3, args)
tc := testcluster.StartTestCluster(t, 1, args)
defer tc.Stopper().Stop(ctx)
s0 := tc.Server(0)

Expand All @@ -73,7 +72,7 @@ func TestProtectedTimestamps(t *testing.T) {
_, err = conn.Exec("SET CLUSTER SETTING kv.closed_timestamp.target_duration = '100ms'") // speeds up the test
require.NoError(t, err)

const tableRangeMaxBytes = 1 << 18
const tableRangeMaxBytes = 64 << 20
_, err = conn.Exec("ALTER TABLE foo CONFIGURE ZONE USING "+
"gc.ttlseconds = 1, range_max_bytes = $1, range_min_bytes = 1<<10;", tableRangeMaxBytes)
require.NoError(t, err)
Expand Down
460 changes: 284 additions & 176 deletions pkg/kv/kvserver/concurrency/lock_table.go
View file

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions pkg/kv/kvserver/concurrency/lock_table_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1829,16 +1829,17 @@ func TestLockStateSafeFormat(t *testing.T) {
endKey: []byte("END"),
}
l.holder.locked = true
l.holder.holder[lock.Replicated] = lockHolderInfo{
// TODO(arul): add something about replicated locks here too.
l.holder.unreplicatedInfo = unreplicatedLockHolderInfo{
txn: &enginepb.TxnMeta{ID: uuid.NamespaceDNS},
ts: hlc.Timestamp{WallTime: 123, Logical: 7},
seqs: []enginepb.TxnSeq{1},
}
require.EqualValues(t,
" lock: ‹\"KEY\"›\n holder: txn: 6ba7b810-9dad-11d1-80b4-00c04fd430c8, ts: 0.000000123,7, info: repl epoch: 0, seqs: [1]\n",
" lock: ‹\"KEY\"›\n holder: txn: 6ba7b810-9dad-11d1-80b4-00c04fd430c8, ts: 0.000000123,7, info: unrepl epoch: 0, seqs: [1]\n",
redact.Sprint(l))
require.EqualValues(t,
" lock: ‹×›\n holder: txn: 6ba7b810-9dad-11d1-80b4-00c04fd430c8, ts: 0.000000123,7, info: repl epoch: 0, seqs: [1]\n",
" lock: ‹×›\n holder: txn: 6ba7b810-9dad-11d1-80b4-00c04fd430c8, ts: 0.000000123,7, info: unrepl epoch: 0, seqs: [1]\n",
redact.Sprint(l).Redact())
}

Expand Down
88 changes: 44 additions & 44 deletions pkg/kv/kvserver/concurrency/testdata/concurrency_manager/clear_abandoned_intents
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,25 @@ debug-lock-table
----
num=10
lock: "a"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
lock: "b"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
lock: "c"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
lock: "d"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
lock: "e"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
lock: "f"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
lock: "g"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
lock: "h"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
lock: "i"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
lock: "j"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0

sequence req=req1
----
Expand All @@ -72,28 +72,28 @@ debug-lock-table
----
num=10
lock: "a"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
waiting readers:
req: 1, txn: 00000001-0000-0000-0000-000000000000
distinguished req: 1
lock: "b"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
lock: "c"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
lock: "d"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
lock: "e"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
lock: "f"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
lock: "g"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
lock: "h"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
lock: "i"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
lock: "j"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0

debug-advance-clock ts=123
----
Expand Down Expand Up @@ -164,7 +164,7 @@ debug-lock-table
----
num=1
lock: "a"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
queued writers:
active: false req: 2, txn: 00000001-0000-0000-0000-000000000000

Expand Down Expand Up @@ -204,7 +204,7 @@ num=2
queued writers:
active: false req: 2, txn: 00000001-0000-0000-0000-000000000000
lock: "b"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl [holder finalized: committed] epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl [holder finalized: committed] epoch: 0
queued writers:
active: false req: 2, txn: 00000001-0000-0000-0000-000000000000

Expand Down Expand Up @@ -236,7 +236,7 @@ num=3
queued writers:
active: false req: 2, txn: 00000001-0000-0000-0000-000000000000
lock: "c"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl [holder finalized: committed] epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl [holder finalized: committed] epoch: 0
queued writers:
active: false req: 2, txn: 00000001-0000-0000-0000-000000000000

Expand Down Expand Up @@ -306,9 +306,9 @@ debug-lock-table
----
num=2
lock: "a"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
lock: "b"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0

new-request name=req2 txn=txn2 ts=10,1
put key=g value=v1
Expand Down Expand Up @@ -338,9 +338,9 @@ debug-lock-table
----
num=4
lock: "a"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
lock: "b"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
lock: "g"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: unrepl epoch: 0, seqs: [0]
lock: "h"
Expand All @@ -361,12 +361,12 @@ debug-lock-table
----
num=4
lock: "a"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
waiting readers:
req: 3, txn: 00000001-0000-0000-0000-000000000000
distinguished req: 3
lock: "b"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
lock: "g"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: unrepl epoch: 0, seqs: [0]
lock: "h"
Expand Down Expand Up @@ -449,15 +449,15 @@ debug-lock-table
----
num=3
lock: "c"
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
queued writers:
active: false req: 5, txn: 00000001-0000-0000-0000-000000000000
lock: "d"
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
queued writers:
active: false req: 5, txn: 00000001-0000-0000-0000-000000000000
lock: "e"
holder: txn: 00000005-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000005-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
queued writers:
active: false req: 5, txn: 00000001-0000-0000-0000-000000000000

Expand All @@ -476,16 +476,16 @@ debug-lock-table
----
num=3
lock: "c"
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
queued writers:
active: true req: 5, txn: 00000001-0000-0000-0000-000000000000
distinguished req: 5
lock: "d"
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
queued writers:
active: false req: 5, txn: 00000001-0000-0000-0000-000000000000
lock: "e"
holder: txn: 00000005-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000005-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
queued writers:
active: false req: 5, txn: 00000001-0000-0000-0000-000000000000

Expand Down Expand Up @@ -535,16 +535,16 @@ num=5
lock: "b"
holder: txn: 00000004-0000-0000-0000-000000000000, ts: 10.000000000,1, info: unrepl epoch: 0, seqs: [0]
lock: "c"
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
queued writers:
active: true req: 5, txn: 00000001-0000-0000-0000-000000000000
distinguished req: 5
lock: "d"
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
queued writers:
active: false req: 5, txn: 00000001-0000-0000-0000-000000000000
lock: "e"
holder: txn: 00000005-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000005-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
queued writers:
active: false req: 5, txn: 00000001-0000-0000-0000-000000000000

Expand Down Expand Up @@ -575,16 +575,16 @@ num=5
lock: "b"
holder: txn: 00000004-0000-0000-0000-000000000000, ts: 10.000000000,1, info: unrepl epoch: 0, seqs: [0]
lock: "c"
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
queued writers:
active: true req: 5, txn: 00000001-0000-0000-0000-000000000000
distinguished req: 5
lock: "d"
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
queued writers:
active: false req: 5, txn: 00000001-0000-0000-0000-000000000000
lock: "e"
holder: txn: 00000005-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000005-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
queued writers:
active: false req: 5, txn: 00000001-0000-0000-0000-000000000000

Expand Down Expand Up @@ -621,11 +621,11 @@ num=4
queued writers:
active: false req: 5, txn: 00000001-0000-0000-0000-000000000000
lock: "d"
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl [holder finalized: aborted] epoch: 0, seqs: [0]
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl [holder finalized: aborted] epoch: 0
queued writers:
active: false req: 5, txn: 00000001-0000-0000-0000-000000000000
lock: "e"
holder: txn: 00000005-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000005-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
queued writers:
active: true req: 5, txn: 00000001-0000-0000-0000-000000000000
distinguished req: 5
Expand Down Expand Up @@ -657,7 +657,7 @@ num=3
queued writers:
active: false req: 5, txn: 00000001-0000-0000-0000-000000000000
lock: "e"
holder: txn: 00000005-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000005-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
queued writers:
active: true req: 5, txn: 00000001-0000-0000-0000-000000000000
distinguished req: 5
Expand Down
4 changes: 2 additions & 2 deletions ...urrency/testdata/concurrency_manager/clear_abandoned_intents_without_adding_to_lock_table
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ debug-lock-table
----
num=1
lock: "a"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0

sequence req=req1
----
Expand All @@ -51,7 +51,7 @@ debug-lock-table
----
num=1
lock: "a"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
waiting readers:
req: 1, txn: 00000001-0000-0000-0000-000000000000
distinguished req: 1
Expand Down
4 changes: 2 additions & 2 deletions pkg/kv/kvserver/concurrency/testdata/concurrency_manager/discover_lock_after_lease_race
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ debug-lock-table
----
num=1
lock: "k"
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,0, info: repl epoch: 0, seqs: [0]
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,0, info: repl epoch: 0

sequence req=req4
----
Expand All @@ -161,7 +161,7 @@ debug-lock-table
----
num=1
lock: "k"
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,0, info: repl epoch: 0, seqs: [0]
holder: txn: 00000003-0000-0000-0000-000000000000, ts: 10.000000000,0, info: repl epoch: 0
waiting readers:
req: 3, txn: 00000004-0000-0000-0000-000000000000
distinguished req: 3
Expand Down
2 changes: 1 addition & 1 deletion pkg/kv/kvserver/concurrency/testdata/concurrency_manager/discovered_lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ debug-lock-table
----
num=1
lock: "k"
holder: txn: 00000001-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000001-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0

sequence req=req1
----
Expand Down
4 changes: 2 additions & 2 deletions pkg/kv/kvserver/concurrency/testdata/concurrency_manager/lock_timeout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ num=3
active: true req: 3, txn: 00000003-0000-0000-0000-000000000000
distinguished req: 3
lock: "k4"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 11.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 11.000000000,1, info: repl epoch: 0

# -------------------------------------------------------------
# Read-only request with lock timeout discovers abandoned
Expand Down Expand Up @@ -273,7 +273,7 @@ debug-lock-table
----
num=1
lock: "k4"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 11.000000000,1, info: repl [holder finalized: aborted] epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 11.000000000,1, info: repl [holder finalized: aborted] epoch: 0

reset
----
10 changes: 5 additions & 5 deletions pkg/kv/kvserver/concurrency/testdata/concurrency_manager/range_state_listener
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ debug-lock-table
----
num=1
lock: "k"
holder: txn: 00000001-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000001-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
queued writers:
active: false req: 3, txn: 00000002-0000-0000-0000-000000000000

Expand Down Expand Up @@ -279,7 +279,7 @@ debug-lock-table
----
num=1
lock: "k"
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000002-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
queued writers:
active: false req: 4, txn: 00000003-0000-0000-0000-000000000000

Expand Down Expand Up @@ -437,7 +437,7 @@ debug-lock-table
----
num=1
lock: "k"
holder: txn: 00000001-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000001-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
queued writers:
active: false req: 6, txn: 00000002-0000-0000-0000-000000000000

Expand Down Expand Up @@ -657,7 +657,7 @@ debug-lock-table
----
num=1
lock: "k"
holder: txn: 00000001-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000001-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
queued writers:
active: false req: 10, txn: 00000002-0000-0000-0000-000000000000

Expand Down Expand Up @@ -815,7 +815,7 @@ debug-lock-table
----
num=1
lock: "k"
holder: txn: 00000001-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0, seqs: [0]
holder: txn: 00000001-0000-0000-0000-000000000000, ts: 10.000000000,1, info: repl epoch: 0
queued writers:
active: false req: 12, txn: 00000002-0000-0000-0000-000000000000

Expand Down
Loading

0 comments on commit 3c2d5a4

Please sign in to comment.