Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit f2ba552

Browse files
EmyrkEmyrk
committed
all read buffer limits set to a const
1 parent cb2a855 commit f2ba552

File tree

6 files changed

+17
-7
lines changed

6 files changed

+17
-7
lines changed

‎agent/agenttest/client.go

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"golang.org/x/xerrors"
1717
"google.golang.org/protobuf/types/known/durationpb"
1818
"google.golang.org/protobuf/types/known/emptypb"
19+
"storj.io/drpc/drpcmanager"
1920
"storj.io/drpc/drpcmux"
2021
"storj.io/drpc/drpcserver"
2122
"tailscale.com/tailcfg"
@@ -60,6 +61,7 @@ func NewClient(t testing.TB,
6061
err = agentproto.DRPCRegisterAgent(mux, fakeAAPI)
6162
require.NoError(t, err)
6263
server := drpcserver.NewWithOptions(mux, drpcserver.Options{
64+
Manager: drpcmanager.Options{WriterBufferSize: drpcsdk.MaxMessageSize,},
6365
Log: func(err error) {
6466
if xerrors.Is(err, io.EOF) {
6567
return

‎coderd/agentapi/api.go

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111

1212
"github.com/google/uuid"
1313
"golang.org/x/xerrors"
14+
"storj.io/drpc/drpcmanager"
1415
"storj.io/drpc/drpcmux"
1516
"storj.io/drpc/drpcserver"
1617
"tailscale.com/tailcfg"
@@ -30,6 +31,7 @@ import (
3031
"github.com/coder/coder/v2/coderd/wspubsub"
3132
"github.com/coder/coder/v2/codersdk"
3233
"github.com/coder/coder/v2/codersdk/agentsdk"
34+
drpcsdk "github.com/coder/coder/v2/codersdk/drpc"
3335
"github.com/coder/coder/v2/tailnet"
3436
tailnetproto "github.com/coder/coder/v2/tailnet/proto"
3537
"github.com/coder/quartz"
@@ -209,6 +211,7 @@ func (a *API) Server(ctx context.Context) (*drpcserver.Server, error) {
209211

210212
return drpcserver.NewWithOptions(&tracing.DRPCHandler{Handler: mux},
211213
drpcserver.Options{
214+
Manager: drpcmanager.Options{WriterBufferSize: drpcsdk.MaxMessageSize},
212215
Log: func(err error) {
213216
if xerrors.Is(err, io.EOF) {
214217
return

‎coderd/coderd.go

+3
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
"go.opentelemetry.io/otel/trace"
3030
"golang.org/x/xerrors"
3131
"google.golang.org/api/idtoken"
32+
"storj.io/drpc/drpcmanager"
3233
"storj.io/drpc/drpcmux"
3334
"storj.io/drpc/drpcserver"
3435
"tailscale.com/derp"
@@ -85,6 +86,7 @@ import (
8586
"github.com/coder/coder/v2/coderd/workspacestats"
8687
"github.com/coder/coder/v2/codersdk"
8788
"github.com/coder/coder/v2/codersdk/drpc"
89+
drpcsdk "github.com/coder/coder/v2/codersdk/drpc"
8890
"github.com/coder/coder/v2/codersdk/healthsdk"
8991
"github.com/coder/coder/v2/provisionerd/proto"
9092
"github.com/coder/coder/v2/provisionersdk"
@@ -1803,6 +1805,7 @@ func (api *API) CreateInMemoryTaggedProvisionerDaemon(dialCtx context.Context, n
18031805
}
18041806
server := drpcserver.NewWithOptions(&tracing.DRPCHandler{Handler: mux},
18051807
drpcserver.Options{
1808+
Manager: drpcmanager.Options{WriterBufferSize: drpcsdk.MaxMessageSize},
18061809
Log: func(err error) {
18071810
if xerrors.Is(err, io.EOF) {
18081811
return

‎enterprise/coderd/provisionerdaemons.go

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"go.opentelemetry.io/otel/trace"
1616
"golang.org/x/exp/maps"
1717
"golang.org/x/xerrors"
18+
"storj.io/drpc/drpcmanager"
1819
"storj.io/drpc/drpcmux"
1920
"storj.io/drpc/drpcserver"
2021

@@ -31,6 +32,7 @@ import (
3132
"github.com/coder/coder/v2/coderd/telemetry"
3233
"github.com/coder/coder/v2/coderd/util/ptr"
3334
"github.com/coder/coder/v2/codersdk"
35+
drpcsdk "github.com/coder/coder/v2/codersdk/drpc"
3436
"github.com/coder/coder/v2/provisionerd/proto"
3537
"github.com/coder/coder/v2/provisionersdk"
3638
"github.com/coder/websocket"
@@ -370,6 +372,7 @@ func (api *API) provisionerDaemonServe(rw http.ResponseWriter, r *http.Request)
370372
return
371373
}
372374
server := drpcserver.NewWithOptions(mux, drpcserver.Options{
375+
Manager: drpcmanager.Options{WriterBufferSize: drpcsdk.MaxMessageSize},
373376
Log: func(err error) {
374377
if xerrors.Is(err, io.EOF) {
375378
return

‎provisionersdk/serve.go

+3-7
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"storj.io/drpc/drpcmanager"
1515
"storj.io/drpc/drpcmux"
1616
"storj.io/drpc/drpcserver"
17-
"storj.io/drpc/drpcwire"
1817

1918
"cdr.dev/slog"
19+
drpcsdk "github.com/coder/coder/v2/codersdk/drpc"
2020

2121
"github.com/coder/coder/v2/coderd/tracing"
2222
"github.com/coder/coder/v2/provisionersdk/proto"
@@ -86,12 +86,8 @@ func Serve(ctx context.Context, server Server, options *ServeOptions) error {
8686
srv := drpcserver.NewWithOptions(
8787
&tracing.DRPCHandler{Handler: mux},
8888
drpcserver.Options{
89-
Manager: drpcmanager.Options{
90-
Reader: drpcwire.ReaderOptions{
91-
MaximumBufferSize: 0,
92-
},
93-
},
94-
Log: nil,
89+
Manager: drpcmanager.Options{WriterBufferSize: drpcsdk.MaxMessageSize},
90+
Log: nil,
9591
})
9692

9793
if options.Listener != nil {

‎tailnet/service.go

+3
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@ import (
1111
"github.com/google/uuid"
1212
"github.com/hashicorp/yamux"
1313
"golang.org/x/xerrors"
14+
"storj.io/drpc/drpcmanager"
1415
"storj.io/drpc/drpcmux"
1516
"storj.io/drpc/drpcserver"
1617
"tailscale.com/tailcfg"
1718

1819
"cdr.dev/slog"
1920
"github.com/coder/coder/v2/apiversion"
21+
drpcsdk "github.com/coder/coder/v2/codersdk/drpc"
2022
"github.com/coder/coder/v2/tailnet/proto"
2123
"github.com/coder/quartz"
2224
)
@@ -92,6 +94,7 @@ func NewClientService(options ClientServiceOptions) (
9294
return nil, xerrors.Errorf("register DRPC service: %w", err)
9395
}
9496
server := drpcserver.NewWithOptions(mux, drpcserver.Options{
97+
Manager: drpcmanager.Options{WriterBufferSize: drpcsdk.MaxMessageSize},
9598
Log: func(err error) {
9699
if xerrors.Is(err, io.EOF) ||
97100
xerrors.Is(err, context.Canceled) ||

0 commit comments

Comments
 (0)