Skip to content

Commit b8d7285

Browse files
committed
kvpb: handle Prepare Transaction requests
Epic: none Release note: None
1 parent 90db6ea commit b8d7285

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

pkg/ccl/multitenantccl/tenantcapabilitiesccl/testdata/can_prepare_txns

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ok
2828
exec-privileged-op-tenant
2929
PREPARE TRANSACTION 'txn1'
3030
----
31-
pq: ba: QueryIntent [/Tenant/10/Table/104/1/1/0], EndTxn(commit) [/Tenant/10/Table/104/1/1/0], [txn: ‹×›], [can-forward-ts] RPC error: rpc error: code = Unauthenticated desc = client tenant does not have capability "can_prepare_txns" (*kvpb.EndTxnRequest)
31+
pq: ba: QueryIntent [/Tenant/10/Table/104/1/1/0], EndTxn(prepare) [/Tenant/10/Table/104/1/1/0], [txn: ‹×›], [can-forward-ts] RPC error: rpc error: code = Unauthenticated desc = client tenant does not have capability "can_prepare_txns" (*kvpb.EndTxnRequest)
3232

3333

3434
# Grant the capability.
@@ -78,7 +78,7 @@ ok
7878
exec-privileged-op-tenant
7979
PREPARE TRANSACTION 'txn3'
8080
----
81-
pq: ba: QueryIntent [/Tenant/10/Table/104/1/1/0], EndTxn(commit) [/Tenant/10/Table/104/1/1/0], [txn: ‹×›], [can-forward-ts] RPC error: rpc error: code = Unauthenticated desc = client tenant does not have capability "can_prepare_txns" (*kvpb.EndTxnRequest)
81+
pq: ba: QueryIntent [/Tenant/10/Table/104/1/1/0], EndTxn(prepare) [/Tenant/10/Table/104/1/1/0], [txn: ‹×›], [can-forward-ts] RPC error: rpc error: code = Unauthenticated desc = client tenant does not have capability "can_prepare_txns" (*kvpb.EndTxnRequest)
8282

8383

8484
# However, transactions that have not acquired locks are able to be prepared,

pkg/kv/kvpb/api.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,9 @@ var _ SafeFormatterRequest = (*EndTxnRequest)(nil)
248248
func (etr *EndTxnRequest) SafeFormat(s redact.SafePrinter, _ rune) {
249249
s.Printf("%s(", etr.Method())
250250
if etr.Commit {
251-
if etr.IsParallelCommit() {
251+
if etr.Prepare {
252+
s.Printf("prepare")
253+
} else if etr.IsParallelCommit() {
252254
s.Printf("parallel commit")
253255
} else {
254256
s.Printf("commit")

0 commit comments

Comments
 (0)