Merge #157208

craig[bot] · shubhamdhama · craig[bot] · commit bd6fdfe3a465 · 2025-11-18T06:48:58.000Z
157208: rpc: fix DialRPC when NoLoopbackDialer is true r=shubhamdhama a=shubhamdhama

If NoLoopbackDialer is true, then loopbackDRPCDialFn would return the error "loopback dialer called but NoLoopbackDialer was set". This was causing problem with sysbench benchmarks.

Fixes: none
Epic: none
Release note: none

Co-authored-by: Shubham Dhama &lt;shubham.dhama@cockroachlabs.com&gt;
diff --git a/pkg/rpc/drpc.go b/pkg/rpc/drpc.go
@@ -55,7 +55,7 @@ func DialDRPC(
 			_ struct{}) (drpcpool.Conn, error) {
 
 			netConn, err := func(ctx context.Context) (net.Conn, error) {
-				if rpcCtx.ContextOptions.AdvertiseAddr == target && !rpcCtx.ClientOnly {
+				if rpcCtx.ContextOptions.AdvertiseAddr == target && rpcCtx.canLoopbackDial() {
 					return rpcCtx.loopbackDRPCDialFn(ctx)
 				}
 				return drpcmigrate.DialWithHeader(ctx, "tcp", target, drpcmigrate.DRPCHeader)

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ func DialDRPC(`
`55`	`55`	`_ struct{}) (drpcpool.Conn, error) {`
`56`	`56`
`57`	`57`	`netConn, err := func(ctx context.Context) (net.Conn, error) {`
`58`		`- if rpcCtx.ContextOptions.AdvertiseAddr == target && !rpcCtx.ClientOnly {`
	`58`	`+ if rpcCtx.ContextOptions.AdvertiseAddr == target && rpcCtx.canLoopbackDial() {`
`59`	`59`	`return rpcCtx.loopbackDRPCDialFn(ctx)`
`60`	`60`	`}`
`61`	`61`	`return drpcmigrate.DialWithHeader(ctx, "tcp", target, drpcmigrate.DRPCHeader)`