diff --git a/cmd/tools/segment-verify/verify.go b/cmd/tools/segment-verify/verify.go index 2e7970a25..68e5773c2 100644 --- a/cmd/tools/segment-verify/verify.go +++ b/cmd/tools/segment-verify/verify.go @@ -69,7 +69,7 @@ func NewVerifier(log *zap.Logger, dialer rpc.Dialer, orders *orders.Service, con // Verify a collection of segments by attempting to download a byte from each segment from the target node. func (service *NodeVerifier) Verify(ctx context.Context, alias metabase.NodeAlias, target storj.NodeURL, segments []*Segment, ignoreThrottle bool) (verifiedCount int, _ error) { - client, err := piecestore.Dial(ctx, service.dialer, target, piecestore.DefaultConfig) + client, err := piecestore.Dial(rpcpool.WithForceDial(ctx), service.dialer, target, piecestore.DefaultConfig) if err != nil { return 0, ErrNodeOffline.Wrap(err) } @@ -97,7 +97,7 @@ func (service *NodeVerifier) Verify(ctx context.Context, alias metabase.NodeAlia } // redial the client - client, err = piecestore.Dial(ctx, service.dialer, target, piecestore.DefaultConfig) + client, err = piecestore.Dial(rpcpool.WithForceDial(ctx), service.dialer, target, piecestore.DefaultConfig) if err != nil { return i, errs.Combine(ErrNodeOffline.Wrap(err), firstError) } diff --git a/go.mod b/go.mod index 8f2c65dea..cdeb27509 100644 --- a/go.mod +++ b/go.mod @@ -52,7 +52,7 @@ require ( golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e gopkg.in/segmentio/analytics-go.v3 v3.1.0 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 - storj.io/common v0.0.0-20221018143517-9eb8213fe465 + storj.io/common v0.0.0-20221019144311-705673f51b62 storj.io/drpc v0.0.32 storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 storj.io/private v0.0.0-20221011183246-586e5f48357a diff --git a/go.sum b/go.sum index cfe5af1aa..31d85bede 100644 --- a/go.sum +++ b/go.sum @@ -957,8 +957,9 @@ sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2 sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= storj.io/common v0.0.0-20220719163320-cd2ef8e1b9b0/go.mod h1:mCYV6Ud5+cdbuaxdPD5Zht/HYaIn0sffnnws9ErkrMQ= storj.io/common v0.0.0-20220915180246-7826900e2b06/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= -storj.io/common v0.0.0-20221018143517-9eb8213fe465 h1:2o6NDi2sBKkbf54Nz1op+d82yxsH9kUYQ2ETVbRTwn4= storj.io/common v0.0.0-20221018143517-9eb8213fe465/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= +storj.io/common v0.0.0-20221019144311-705673f51b62 h1:Q4EOf+ava5hohEZSNjTgLE9kg8+TwqBR87wS6il7uqA= +storj.io/common v0.0.0-20221019144311-705673f51b62/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= storj.io/drpc v0.0.32 h1:5p5ZwsK/VOgapaCu+oxaPVwO6UwIs+iwdMiD50+R4PI= storj.io/drpc v0.0.32/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg= storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 h1:SVuEocEhZfFc13J1AmlVLitdGXTVrvmbzN4Z9C9Ms40= diff --git a/private/testplanet/rpc_test.go b/private/testplanet/rpc_test.go index 962ede140..b7e51f66b 100644 --- a/private/testplanet/rpc_test.go +++ b/private/testplanet/rpc_test.go @@ -17,6 +17,7 @@ import ( "storj.io/common/peertls/tlsopts" "storj.io/common/rpc" "storj.io/common/rpc/quic" + "storj.io/common/rpc/rpcpool" "storj.io/common/storj" "storj.io/common/testcontext" "storj.io/storj/private/testplanet" @@ -78,7 +79,7 @@ func TestDialNodeURL(t *testing.T) { tag := fmt.Sprintf("%+v", target) timedCtx, cancel := context.WithTimeout(ctx, time.Second) - conn, err := dialer.DialNodeURL(timedCtx, target) + conn, err := dialer.DialNodeURL(rpcpool.WithForceDial(timedCtx), target) cancel() assert.Error(t, err, tag) assert.Nil(t, conn, tag) @@ -87,7 +88,7 @@ func TestDialNodeURL(t *testing.T) { t.Run("DialNode with valid signed target", func(t *testing.T) { timedCtx, cancel := context.WithTimeout(ctx, time.Second) - conn, err := dialer.DialNodeURL(timedCtx, planet.StorageNodes[1].NodeURL()) + conn, err := dialer.DialNodeURL(rpcpool.WithForceDial(timedCtx), planet.StorageNodes[1].NodeURL()) cancel() assert.NoError(t, err) @@ -98,7 +99,7 @@ func TestDialNodeURL(t *testing.T) { t.Run("DialNode with unsigned identity", func(t *testing.T) { timedCtx, cancel := context.WithTimeout(ctx, time.Second) - conn, err := unsignedDialer.DialNodeURL(timedCtx, planet.StorageNodes[1].NodeURL()) + conn, err := unsignedDialer.DialNodeURL(rpcpool.WithForceDial(timedCtx), planet.StorageNodes[1].NodeURL()) cancel() assert.NotNil(t, conn) @@ -108,7 +109,7 @@ func TestDialNodeURL(t *testing.T) { t.Run("DialAddress with unsigned identity", func(t *testing.T) { timedCtx, cancel := context.WithTimeout(ctx, time.Second) - conn, err := unsignedDialer.DialAddressInsecure(timedCtx, planet.StorageNodes[1].Addr()) + conn, err := unsignedDialer.DialAddressInsecure(rpcpool.WithForceDial(timedCtx), planet.StorageNodes[1].Addr()) cancel() assert.NotNil(t, conn) @@ -118,7 +119,7 @@ func TestDialNodeURL(t *testing.T) { t.Run("DialAddress with valid address", func(t *testing.T) { timedCtx, cancel := context.WithTimeout(ctx, time.Second) - conn, err := dialer.DialAddressInsecure(timedCtx, planet.StorageNodes[1].Addr()) + conn, err := dialer.DialAddressInsecure(rpcpool.WithForceDial(timedCtx), planet.StorageNodes[1].Addr()) cancel() assert.NoError(t, err) @@ -175,7 +176,7 @@ func TestDialNode_BadServerCertificate(t *testing.T) { test := func(t *testing.T, ctx *testcontext.Context, planet *testplanet.Planet, dialer rpc.Dialer) { t.Run("DialNodeURL with bad server certificate", func(t *testing.T) { timedCtx, cancel := context.WithTimeout(ctx, time.Second) - conn, err := dialer.DialNodeURL(timedCtx, planet.StorageNodes[1].NodeURL()) + conn, err := dialer.DialNodeURL(rpcpool.WithForceDial(timedCtx), planet.StorageNodes[1].NodeURL()) cancel() tag := fmt.Sprintf("%+v", planet.StorageNodes[1].NodeURL()) @@ -186,7 +187,7 @@ func TestDialNode_BadServerCertificate(t *testing.T) { t.Run("DialAddress with bad server certificate", func(t *testing.T) { timedCtx, cancel := context.WithTimeout(ctx, time.Second) - conn, err := dialer.DialNodeURL(timedCtx, planet.StorageNodes[1].NodeURL()) + conn, err := dialer.DialNodeURL(rpcpool.WithForceDial(timedCtx), planet.StorageNodes[1].NodeURL()) cancel() assert.Nil(t, conn) diff --git a/satellite/audit/verifier.go b/satellite/audit/verifier.go index 516e0a233..ede972e91 100644 --- a/satellite/audit/verifier.go +++ b/satellite/audit/verifier.go @@ -22,6 +22,7 @@ import ( "storj.io/common/pb" "storj.io/common/pkcrypto" "storj.io/common/rpc" + "storj.io/common/rpc/rpcpool" "storj.io/common/rpc/rpcstatus" "storj.io/common/storj" "storj.io/storj/satellite/metabase" @@ -627,7 +628,7 @@ func (verifier *Verifier) GetShare(ctx context.Context, limit *pb.AddressedOrder ID: targetNodeID, Address: cachedIPAndPort, } - ps, err = piecestore.Dial(timedCtx, verifier.dialer, nodeAddr, piecestore.DefaultConfig) + ps, err = piecestore.Dial(rpcpool.WithForceDial(timedCtx), verifier.dialer, nodeAddr, piecestore.DefaultConfig) if err != nil { log.Debug("failed to connect to audit target node at cached IP", zap.String("cached-ip-and-port", cachedIPAndPort), zap.Error(err)) } @@ -639,7 +640,7 @@ func (verifier *Verifier) GetShare(ctx context.Context, limit *pb.AddressedOrder ID: targetNodeID, Address: limit.GetStorageNodeAddress().Address, } - ps, err = piecestore.Dial(timedCtx, verifier.dialer, nodeAddr, piecestore.DefaultConfig) + ps, err = piecestore.Dial(rpcpool.WithForceDial(timedCtx), verifier.dialer, nodeAddr, piecestore.DefaultConfig) if err != nil { return Share{}, Error.Wrap(err) } diff --git a/satellite/repair/repairer/ec.go b/satellite/repair/repairer/ec.go index 836d5223a..84c285b3f 100644 --- a/satellite/repair/repairer/ec.go +++ b/satellite/repair/repairer/ec.go @@ -22,6 +22,7 @@ import ( "storj.io/common/errs2" "storj.io/common/pb" "storj.io/common/rpc" + "storj.io/common/rpc/rpcpool" "storj.io/common/signing" "storj.io/common/storj" "storj.io/common/sync2" @@ -61,7 +62,7 @@ func NewECRepairer(log *zap.Logger, dialer rpc.Dialer, satelliteSignee signing.S } func (ec *ECRepairer) dialPiecestore(ctx context.Context, n storj.NodeURL) (*piecestore.Client, error) { - client, err := piecestore.Dial(ctx, ec.dialer, n, piecestore.DefaultConfig) + client, err := piecestore.Dial(rpcpool.WithForceDial(ctx), ec.dialer, n, piecestore.DefaultConfig) return client, ErrDialFailed.Wrap(err) } diff --git a/storagenode/trust/service.go b/storagenode/trust/service.go index 05ba1deb1..3d421561c 100644 --- a/storagenode/trust/service.go +++ b/storagenode/trust/service.go @@ -16,6 +16,7 @@ import ( "storj.io/common/identity" "storj.io/common/rpc" + "storj.io/common/rpc/rpcpool" "storj.io/common/signing" "storj.io/common/storj" "storj.io/common/sync2" @@ -49,7 +50,7 @@ func Dialer(dialer rpc.Dialer) IdentityResolver { return IdentityResolverFunc(func(ctx context.Context, url storj.NodeURL) (_ *identity.PeerIdentity, err error) { defer mon.Task()(&ctx)(&err) - conn, err := dialer.DialNodeURL(ctx, url) + conn, err := dialer.DialNodeURL(rpcpool.WithForceDial(ctx), url) if err != nil { return nil, err } diff --git a/testsuite/storjscan/go.mod b/testsuite/storjscan/go.mod index 1675c3a1b..4a1d58bc0 100644 --- a/testsuite/storjscan/go.mod +++ b/testsuite/storjscan/go.mod @@ -10,7 +10,7 @@ require ( github.com/zeebo/errs v1.3.0 go.uber.org/zap v1.21.0 golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde - storj.io/common v0.0.0-20221018161414-10811877ffe1 + storj.io/common v0.0.0-20221019144311-705673f51b62 storj.io/private v0.0.0-20221011183246-586e5f48357a storj.io/storj v1.63.1 storj.io/storjscan v0.0.0-20220926140643-1623c3b391b0 diff --git a/testsuite/storjscan/go.sum b/testsuite/storjscan/go.sum index f3981aa06..42ef5e781 100644 --- a/testsuite/storjscan/go.sum +++ b/testsuite/storjscan/go.sum @@ -1263,8 +1263,8 @@ storj.io/common v0.0.0-20220802175255-aae0c09ec9d4/go.mod h1:+gF7jbVvpjVIVHhK+EJ storj.io/common v0.0.0-20220829171748-14b0a3c9565e/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= storj.io/common v0.0.0-20220915180246-7826900e2b06/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= storj.io/common v0.0.0-20221018143517-9eb8213fe465/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= -storj.io/common v0.0.0-20221018161414-10811877ffe1 h1:nIp0EH8kRDuA2eHNcsx6w3s8pmWLQEfOG2WF1yc6kmk= -storj.io/common v0.0.0-20221018161414-10811877ffe1/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= +storj.io/common v0.0.0-20221019144311-705673f51b62 h1:Q4EOf+ava5hohEZSNjTgLE9kg8+TwqBR87wS6il7uqA= +storj.io/common v0.0.0-20221019144311-705673f51b62/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= storj.io/drpc v0.0.32 h1:5p5ZwsK/VOgapaCu+oxaPVwO6UwIs+iwdMiD50+R4PI= storj.io/drpc v0.0.32/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg= storj.io/monkit-jaeger v0.0.0-20220726162929-c3a9898b5bca/go.mod h1:iK+dmHZZXQlW7ahKdNSOo+raMk5BDL2wbD62FIeXLWs= diff --git a/testsuite/ui/go.mod b/testsuite/ui/go.mod index 319079cc0..4b6928d52 100644 --- a/testsuite/ui/go.mod +++ b/testsuite/ui/go.mod @@ -10,7 +10,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.0 go.uber.org/zap v1.17.0 - storj.io/common v0.0.0-20221018161414-10811877ffe1 + storj.io/common v0.0.0-20221019144311-705673f51b62 storj.io/gateway-mt v1.18.1-0.20211210081136-cada9a567d31 storj.io/private v0.0.0-20221011183246-586e5f48357a storj.io/storj v0.12.1-0.20220705102727-0f626a59c103 diff --git a/testsuite/ui/go.sum b/testsuite/ui/go.sum index a199ce482..2e5f50aa2 100644 --- a/testsuite/ui/go.sum +++ b/testsuite/ui/go.sum @@ -1502,8 +1502,8 @@ storj.io/common v0.0.0-20211102144601-401a79f0706a/go.mod h1:a2Kw7Uipu929OFANfWK storj.io/common v0.0.0-20220719163320-cd2ef8e1b9b0/go.mod h1:mCYV6Ud5+cdbuaxdPD5Zht/HYaIn0sffnnws9ErkrMQ= storj.io/common v0.0.0-20220915180246-7826900e2b06/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= storj.io/common v0.0.0-20221018143517-9eb8213fe465/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= -storj.io/common v0.0.0-20221018161414-10811877ffe1 h1:nIp0EH8kRDuA2eHNcsx6w3s8pmWLQEfOG2WF1yc6kmk= -storj.io/common v0.0.0-20221018161414-10811877ffe1/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= +storj.io/common v0.0.0-20221019144311-705673f51b62 h1:Q4EOf+ava5hohEZSNjTgLE9kg8+TwqBR87wS6il7uqA= +storj.io/common v0.0.0-20221019144311-705673f51b62/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= storj.io/dotworld v0.0.0-20210324183515-0d11aeccd840/go.mod h1:KU9YvEgRrMMiWLvH8pzn1UkoCoxggKIPvQxmNdx7aXQ= storj.io/drpc v0.0.11/go.mod h1:TiFc2obNjL9/3isMW1Rpxjy8V9uE0B2HMeMFGiiI7Iw= storj.io/drpc v0.0.24/go.mod h1:ofQUDPQbbIymRDKE0tms48k8bLP5Y+dsI9CbXGv3gko=