Skip to content

Commit

Permalink
Merge #114973
Browse files Browse the repository at this point in the history 
114973: Revert "kv: store span by pointer in latch struct" r=kvoli,arulajmani a=stevendanna

This reverts commit 831c61d.

This commit introduced a data race.  I believe the fundamental data race is that we hand out a pointer here:

https://github.com/lyang24/cockroach/blob/831c61ded84ba2d5887736f7046a45c3cac3cd4c/pkg/kv/kvserver/spanlatch/manager.go#L224

But, in release, in some cases we attempt to reuse the underlying slice and zero it out before hand:

https://github.com/lyang24/cockroach/blob/831c61ded84ba2d5887736f7046a45c3cac3cd4c/pkg/kv/kvserver/spanset/spanset.go#L113-L115

Here, I just revert the offending commit rather than fixing it so that we can unblock CI.

<details><summary>Data Race Stack Trace</summary>

```
09:21:44     WARNING: DATA RACE
09:21:44     Read at 0x00c003dca940 by goroutine 642:
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanlatch.(*latch).Key()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanlatch/manager.go:119 +0xfb
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanlatch.(*iterator).constrainMinSearchBounds.func1()
09:21:44           github.com/cockroachdb/cockroach/bazel-out/k8-fastbuild/bin/pkg/kv/kvserver/spanlatch/latch_interval_btree.go:1087 +0x28
09:21:44       sort.Search()
09:21:44           GOROOT/src/sort/search.go:65 +0x53
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanlatch.(*iterator).constrainMinSearchBounds()
09:21:44           github.com/cockroachdb/cockroach/bazel-out/k8-fastbuild/bin/pkg/kv/kvserver/spanlatch/latch_interval_btree.go:1086 +0xfa
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanlatch.(*iterator).FirstOverlap()
09:21:44           github.com/cockroachdb/cockroach/bazel-out/k8-fastbuild/bin/pkg/kv/kvserver/spanlatch/latch_interval_btree.go:1069 +0x1b7
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanlatch.(*Manager).iterAndWait()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanlatch/manager.go:551 +0x7a
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanlatch.(*Manager).wait()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanlatch/manager.go:527 +0x5b9
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanlatch.(*Manager).Acquire()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanlatch/manager.go:253 +0x1c4
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency.(*latchManagerImpl).Acquire()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/latch_manager.go:28 +0x64
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency.(*managerImpl).sequenceReqWithGuard()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/concurrency_manager.go:291 +0x6c7
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency.(*managerImpl).SequenceReq()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/concurrency_manager.go:239 +0x328
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver.(*Replica).executeBatchWithConcurrencyRetries()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/pkg/kv/kvserver/replica_send.go:468 +0x514
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver.(*Replica).SendWithWriteBytes()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/pkg/kv/kvserver/replica_send.go:189 +0x575
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver.(*Store).SendWithWriteBytes()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/pkg/kv/kvserver/store_send.go:193 +0xc91
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver.(*Stores).SendWithWriteBytes()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/pkg/kv/kvserver/stores.go:202 +0x176
09:21:44       github.com/cockroachdb/cockroach/pkg/server.(*Node).batchInternal()
09:21:44           github.com/cockroachdb/cockroach/pkg/server/node.go:1333 +0x7c4
09:21:44       github.com/cockroachdb/cockroach/pkg/server.(*Node).Batch()
09:21:44           github.com/cockroachdb/cockroach/pkg/server/node.go:1464 +0x464
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.makeInternalClientAdapter.func1()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:704 +0x76
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.NewServerEx.ServerInterceptor.func12()
09:21:44           github.com/cockroachdb/cockroach/pkg/util/tracing/grpcinterceptor/grpc_interceptor.go:97 +0x5ab
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.makeInternalClientAdapter.chainUnaryServerInterceptors.bindUnaryServerInterceptorToHandler.func4()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:815 +0x88
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.NewServerEx.func3()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:169 +0xf0
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.makeInternalClientAdapter.chainUnaryServerInterceptors.bindUnaryServerInterceptorToHandler.func4()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:815 +0x88
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.kvAuth.unaryInterceptor()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/auth.go:105 +0x2f3
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.kvAuth.unaryInterceptor-fm()
09:21:44           <autogenerated>:1 +0xdc
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.makeInternalClientAdapter.chainUnaryServerInterceptors.bindUnaryServerInterceptorToHandler.func4()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:815 +0x88
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.NewServerEx.func1.1()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:136 +0x6a
09:21:44       github.com/cockroachdb/cockroach/pkg/util/stop.(*Stopper).RunTaskWithErr()
09:21:44           github.com/cockroachdb/cockroach/pkg/util/stop/stopper.go:336 +0x137
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.NewServerEx.func1()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:134 +0x144
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.makeInternalClientAdapter.chainUnaryServerInterceptors.bindUnaryServerInterceptorToHandler.func4()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:815 +0x88
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.makeInternalClientAdapter.func2()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:714 +0x7a
09:21:44     FAIL: //pkg/cloud/userfile:userfile_test (see /home/roach/.cache/bazel/_bazel_roach/c5a4e7d36696d9cd970af2045211a7df/execroot/com_github_cockroachdb_cockroach/bazel-out/k8-fastbuild/testlogs/pkg/cloud/userfile/userfile_test/test.log)
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.NewContext.ClientInterceptor.func8()
09:21:44           github.com/cockroachdb/cockroach/pkg/util/tracing/grpcinterceptor/grpc_interceptor.go:228 +0x519
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.getChainUnaryInvoker.func1()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:899 +0x199
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.makeInternalClientAdapter.func3()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:784 +0x422
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.internalClientAdapter.Batch()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:907 +0xed
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.(*internalClientAdapter).Batch()
09:21:44           <autogenerated>:1 +0x29
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*grpcTransport).sendBatch()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/transport.go:211 +0x2a2
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*grpcTransport).SendNext()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/transport.go:189 +0x144
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.raceTransport.SendNext()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/transport_race.go:76 +0x3a3
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*raceTransport).SendNext()
09:21:44           <autogenerated>:1 +0x6b
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*DistSender).sendToReplicas()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/dist_sender.go:2430 +0x1cf2
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*DistSender).sendPartialBatch()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/dist_sender.go:1931 +0x9c4
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*DistSender).divideAndSendBatchToRanges()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/dist_sender.go:1499 +0x564
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*DistSender).Send()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/dist_sender.go:1115 +0xa2f
09:21:44       github.com/cockroachdb/cockroach/pkg/kv.(*CrossRangeTxnWrapperSender).Send()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/db.go:224 +0xf2
09:21:44       github.com/cockroachdb/cockroach/pkg/kv.(*DB).sendUsingSender()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/db.go:1090 +0x181
09:21:44       github.com/cockroachdb/cockroach/pkg/kv.(*DB).send()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/db.go:1073 +0x71
09:21:44       github.com/cockroachdb/cockroach/pkg/kv.(*DB).send-fm()
09:21:44           <autogenerated>:1 +0x1f
09:21:44       github.com/cockroachdb/cockroach/pkg/kv.sendAndFill()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/db.go:922 +0x26f
09:21:44       github.com/cockroachdb/cockroach/pkg/kv.(*DB).Run()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/db.go:945 +0x92
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/intentresolver.(*IntentResolver).MaybePushTransactions()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/intentresolver/intent_resolver.go:438 +0xa93
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/intentresolver.(*IntentResolver).PushTransaction()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/intentresolver/intent_resolver.go:342 +0x165
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency.(*lockTableWaiterImpl).pushLockTxn()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/lock_table_waiter.go:527 +0x6d8
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency.(*lockTableWaiterImpl).WaitOn()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/lock_table_waiter.go:435 +0x897
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency.(*managerImpl).sequenceReqWithGuard()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/concurrency_manager.go:348 +0x1059
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency.(*managerImpl).SequenceReq()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/concurrency_manager.go:239 +0x328
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver.(*Replica).executeBatchWithConcurrencyRetries()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/pkg/kv/kvserver/replica_send.go:468 +0x514
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver.(*Replica).SendWithWriteBytes()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/pkg/kv/kvserver/replica_send.go:185 +0x504
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver.(*Store).SendWithWriteBytes()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/pkg/kv/kvserver/store_send.go:193 +0xc91
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver.(*Stores).SendWithWriteBytes()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/pkg/kv/kvserver/stores.go:202 +0x176
09:21:44       github.com/cockroachdb/cockroach/pkg/server.(*Node).batchInternal()
09:21:44           github.com/cockroachdb/cockroach/pkg/server/node.go:1333 +0x7c4
09:21:44       github.com/cockroachdb/cockroach/pkg/server.(*Node).Batch()
09:21:44           github.com/cockroachdb/cockroach/pkg/server/node.go:1464 +0x464
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.makeInternalClientAdapter.func1()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:704 +0x76
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.NewServerEx.ServerInterceptor.func12()
09:21:44           github.com/cockroachdb/cockroach/pkg/util/tracing/grpcinterceptor/grpc_interceptor.go:97 +0x5ab
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.makeInternalClientAdapter.chainUnaryServerInterceptors.bindUnaryServerInterceptorToHandler.func4()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:815 +0x88
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.NewServerEx.func3()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:169 +0xf0
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.makeInternalClientAdapter.chainUnaryServerInterceptors.bindUnaryServerInterceptorToHandler.func4()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:815 +0x88
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.kvAuth.unaryInterceptor()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/auth.go:105 +0x2f3
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.kvAuth.unaryInterceptor-fm()
09:21:44           <autogenerated>:1 +0xdc
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.makeInternalClientAdapter.chainUnaryServerInterceptors.bindUnaryServerInterceptorToHandler.func4()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:815 +0x88
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.NewServerEx.func1.1()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:136 +0x6a
09:21:44       github.com/cockroachdb/cockroach/pkg/util/stop.(*Stopper).RunTaskWithErr()
09:21:44           github.com/cockroachdb/cockroach/pkg/util/stop/stopper.go:336 +0x137
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.NewServerEx.func1()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:134 +0x144
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.makeInternalClientAdapter.chainUnaryServerInterceptors.bindUnaryServerInterceptorToHandler.func4()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:815 +0x88
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.makeInternalClientAdapter.func2()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:714 +0x7a
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.NewContext.ClientInterceptor.func8()
09:21:44           github.com/cockroachdb/cockroach/pkg/util/tracing/grpcinterceptor/grpc_interceptor.go:228 +0x519
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.getChainUnaryInvoker.func1()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:899 +0x199
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.makeInternalClientAdapter.func3()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:784 +0x422
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.internalClientAdapter.Batch()
09:21:44           github.com/cockroachdb/cockroach/pkg/rpc/pkg/rpc/context.go:907 +0xed
09:21:44       github.com/cockroachdb/cockroach/pkg/rpc.(*internalClientAdapter).Batch()
09:21:44           <autogenerated>:1 +0x29
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*grpcTransport).sendBatch()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/transport.go:211 +0x2a2
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*grpcTransport).SendNext()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/transport.go:189 +0x144
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.raceTransport.SendNext()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/transport_race.go:76 +0x3a3
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*raceTransport).SendNext()
09:21:44           <autogenerated>:1 +0x6b
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*DistSender).sendToReplicas()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/dist_sender.go:2430 +0x1cf2
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*DistSender).sendPartialBatch()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/dist_sender.go:1931 +0x9c4
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*DistSender).divideAndSendBatchToRanges()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/dist_sender.go:1499 +0x564
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*DistSender).Send()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/dist_sender.go:1115 +0xa2f
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*txnLockGatekeeper).SendLocked()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/txn_lock_gatekeeper.go:82 +0x214
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*txnMetricRecorder).SendLocked()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/txn_interceptor_metric_recorder.go:47 +0x1a4
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*txnSpanRefresher).tryRefreshTxnSpans()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/txn_interceptor_span_refresher.go:627 +0x4d7
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*txnSpanRefresher).maybeRefreshPreemptively()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/txn_interceptor_span_refresher.go:513 +0x5d8
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*txnSpanRefresher).SendLocked()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/txn_interceptor_span_refresher.go:144 +0x154
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*txnCommitter).SendLocked()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/txn_interceptor_committer.go:195 +0x3fa
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*txnPipeliner).SendLocked()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/txn_interceptor_pipeliner.go:295 +0x244
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*txnSeqNumAllocator).SendLocked()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/txn_interceptor_seq_num_allocator.go:114 +0x39d
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*txnHeartbeater).SendLocked()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/txn_interceptor_heartbeater.go:246 +0x793
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*TxnCoordSender).Send()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/txn_coord_sender.go:533 +0x9d3
09:21:44       github.com/cockroachdb/cockroach/pkg/kv.(*DB).sendUsingSender()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/db.go:1090 +0x181
09:21:44       github.com/cockroachdb/cockroach/pkg/kv.(*Txn).Send()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/txn.go:1218 +0x2d4
09:21:44       github.com/cockroachdb/cockroach/pkg/kv.(*Txn).commit()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/txn.go:774 +0x204
09:21:44       github.com/cockroachdb/cockroach/pkg/kv.(*Txn).Commit()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/txn.go:784 +0xa4
09:21:44       github.com/cockroachdb/cockroach/pkg/sql.(*connExecutor).commitSQLTransactionInternal()
09:21:44           github.com/cockroachdb/cockroach/pkg/sql/conn_executor_exec.go:1496 +0x98a
09:21:44       github.com/cockroachdb/cockroach/pkg/sql.(*InternalExecutor).commitTxn()
09:21:44           github.com/cockroachdb/cockroach/pkg/sql/internal.go:1267 +0x7c4
09:21:44       github.com/cockroachdb/cockroach/pkg/sql.(*InternalDB).newInternalExecutorWithTxn.func1()
09:21:44           github.com/cockroachdb/cockroach/pkg/sql/internal.go:1695 +0xda
09:21:44       github.com/cockroachdb/cockroach/pkg/sql.(*InternalDB).txn.func4()
09:21:44           github.com/cockroachdb/cockroach/pkg/sql/internal.go:1828 +0x681
09:21:44       github.com/cockroachdb/cockroach/pkg/kv.(*Txn).exec()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/txn.go:1012 +0x8f
09:21:44       github.com/cockroachdb/cockroach/pkg/kv.runTxn()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/db.go:1055 +0x64
09:21:44       github.com/cockroachdb/cockroach/pkg/kv.(*DB).TxnWithAdmissionControl()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/db.go:1018 +0xec
09:21:44       github.com/cockroachdb/cockroach/pkg/kv.(*DB).Txn()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/db.go:993 +0x5c
09:21:44       github.com/cockroachdb/cockroach/pkg/kv.(*DB).Txn-fm()
09:21:44           <autogenerated>:1 +0x1b
09:21:44       github.com/cockroachdb/cockroach/pkg/sql.(*InternalDB).txn()
09:21:44           github.com/cockroachdb/cockroach/pkg/sql/internal.go:1800 +0x635
09:21:44     Target //pkg/cloud/userfile:userfile_test up-to-date:
09:21:44       github.com/cockroachdb/cockroach/pkg/sql.(*InternalDB).Txn()
09:21:44           github.com/cockroachdb/cockroach/pkg/sql/internal.go:1735 +0xec
09:21:44       _bazel/bin/pkg/cloud/userfile/userfile_test_/userfile_test
09:21:44       github.com/cockroachdb/cockroach/pkg/sql/sqlstats/persistedsqlstats.(*jobMonitor).updateSchedule()
09:21:44           github.com/cockroachdb/cockroach/pkg/sql/sqlstats/persistedsqlstats/pkg/sql/sqlstats/persistedsqlstats/scheduled_job_monitor.go:168 +0x3fa
09:21:44       github.com/cockroachdb/cockroach/pkg/sql/sqlstats/persistedsqlstats.(*jobMonitor).start.func1()
09:21:44           github.com/cockroachdb/cockroach/pkg/sql/sqlstats/persistedsqlstats/pkg/sql/sqlstats/persistedsqlstats/scheduled_job_monitor.go:117 +0x65d
09:21:44       github.com/cockroachdb/cockroach/pkg/util/stop.(*Stopper).RunAsyncTaskEx.func2()
09:21:44           github.com/cockroachdb/cockroach/pkg/util/stop/stopper.go:484 +0x1ea
09:21:44     
09:21:44     Previous write at 0x00c003dca940 by goroutine 232:
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset.(*SpanSet).Release()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset/spanset.go:114 +0x1b7
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency.releaseGuard()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/concurrency_manager.go:674 +0x64
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency.(*managerImpl).FinishReq()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/concurrency_manager.go:453 +0x1d9
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver.(*endCmds).done()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/pkg/kv/kvserver/replica_send.go:1367 +0x36f
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver.(*ProposalData).finishApplication()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/pkg/kv/kvserver/replica_proposal.go:242 +0x9d
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver.(*replicatedCmd).AckOutcomeAndFinish()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/pkg/kv/kvserver/replica_application_cmd.go:156 +0x11a
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/apply.AppliedCommand.AckOutcomeAndFinish()
09:21:44           <autogenerated>:1 +0x55
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/apply.forEachAppliedCmdIter()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/apply/cmd.go:268 +0x135
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/apply.(*Task).applyOneBatch()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/apply/task.go:301 +0x2b9
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver/apply.(*Task).ApplyCommittedEntries()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/apply/task.go:251 +0xce
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver.(*Replica).handleRaftReadyRaftMuLocked()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/pkg/kv/kvserver/replica_raft.go:1053 +0x1b58
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver.(*Replica).handleRaftReady()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/pkg/kv/kvserver/replica_raft.go:740 +0x21b
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver.(*Store).processReady()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/pkg/kv/kvserver/store_raft.go:689 +0x1ef
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver.(*raftSchedulerShard).worker()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/pkg/kv/kvserver/scheduler.go:418 +0x306
09:21:44       github.com/cockroachdb/cockroach/pkg/kv/kvserver.(*raftScheduler).Start.func2()
09:21:44           github.com/cockroachdb/cockroach/pkg/kv/kvserver/pkg/kv/kvserver/scheduler.go:321 +0x94
09:21:44       github.com/cockroachdb/cockroach/pkg/util/stop.(*Stopper).RunAsyncTaskEx.func2()
09:21:44           github.com/cockroachdb/cockroach/pkg/util/stop/stopper.go:484 +0x1ea
```

</details>

Epic: none

Release note: None

Co-authored-by: Steven Danna <[email protected]>
  • Loading branch information
@stevendanna
craig[bot] and stevendanna committed Nov 22, 2023
2 parents a94dbaf + f2b7e9f commit d23688e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 44 deletions.
49 changes: 13 additions & 36 deletions pkg/kv/kvserver/spanlatch/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func Make(stopper *stop.Stopper, slowReqs *metric.Gauge) Manager {
type latch struct {
*signals
id uint64
span *roachpb.Span
span roachpb.Span
ts hlc.Timestamp
next, prev *latch // readSet linked-list.
}
Expand All @@ -109,36 +109,13 @@ func (la *latch) SafeFormat(w redact.SafePrinter, _ rune) {
//go:generate ../../../util/interval/generic/gen.sh *latch spanlatch

// Methods required by util/interval/generic type contract.
func (la *latch) New() *latch { return new(latch) }
func (la *latch) ID() uint64 { return la.id }
func (la *latch) SetID(v uint64) { la.id = v }
func (la *latch) Key() []byte {
if la.span == nil {
return nil
}
return la.span.Key
}
func (la *latch) EndKey() []byte {
if la.span == nil {
return nil
}
return la.span.EndKey
}
func (la *latch) SetKey(v []byte) {
la.initSpan()
la.span.Key = v
}
func (la *latch) SetEndKey(v []byte) {
la.initSpan()
la.span.EndKey = v
}

// initSpan lazily initializes the latch's span field. Only used in tests.
func (la *latch) initSpan() {
if la.span == nil {
la.span = new(roachpb.Span)
}
}
func (la *latch) ID() uint64 { return la.id }
func (la *latch) Key() []byte { return la.span.Key }
func (la *latch) EndKey() []byte { return la.span.EndKey }
func (la *latch) New() *latch { return new(latch) }
func (la *latch) SetID(v uint64) { la.id = v }
func (la *latch) SetKey(v []byte) { la.span.Key = v }
func (la *latch) SetEndKey(v []byte) { la.span.EndKey = v }

type signals struct {
done signal
Expand Down Expand Up @@ -221,7 +198,7 @@ func newGuard(spans *spanset.SpanSet, pp poison.Policy) *Guard {
ssLatches := latches[:n]
for i := range ssLatches {
latch := &latches[i]
latch.span = &ss[i].Span
latch.span = ss[i].Span
latch.signals = &guard.signals
latch.ts = ss[i].Timestamp
// latch.setID() in Manager.insert, under lock.
Expand Down Expand Up @@ -310,9 +287,9 @@ func (m *Manager) CheckOptimisticNoConflicts(lg *Guard, spans *spanset.SpanSet)
tr := &snap.trees[s]
for a := spanset.SpanAccess(0); a < spanset.NumSpanAccess; a++ {
ss := spans.GetSpans(a, s)
for i := range ss {
search.span = &ss[i].Span
search.ts = ss[i].Timestamp
for _, sp := range ss {
search.span = sp.Span
search.ts = sp.Timestamp
switch a {
case spanset.SpanReadOnly:
// Search for writes at equal or lower timestamps.
Expand Down Expand Up @@ -584,7 +561,7 @@ func (m *Manager) waitForSignal(
// ourselves anyway, so we don't need to self-poison.
switch pp {
case poison.Policy_Error:
return poison.NewPoisonedError(*held.span, held.ts)
return poison.NewPoisonedError(held.span, held.ts)
case poison.Policy_Wait:
log.Eventf(ctx, "encountered poisoned latch; continuing to wait")
wait.poison.signal()
Expand Down
8 changes: 0 additions & 8 deletions pkg/kv/kvserver/spanlatch/manager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"strings"
"testing"
"time"
"unsafe"

"github.com/cockroachdb/cockroach/pkg/keys"
"github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/poison"
Expand Down Expand Up @@ -682,13 +681,6 @@ func TestLatchManagerWaitFor(t *testing.T) {
m.Release(lg3)
}

// TestSizeOfLatch tests the size of the latch struct.
func TestSizeOfLatch(t *testing.T) {
var la latch
size := int(unsafe.Sizeof(la))
require.Equal(t, 56, size)
}

func BenchmarkLatchManagerReadOnlyMix(b *testing.B) {
for _, size := range []int{1, 4, 16, 64, 128, 256} {
b.Run(fmt.Sprintf("size=%d", size), func(b *testing.B) {
Expand Down

0 comments on commit d23688e

Please sign in to comment.