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

Skip to content

Commit cb2a855

Browse files
committed
expose maximum buffer size reader option
1 parent b028db4 commit cb2a855

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

provisionerd/provisionerd_test.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,6 @@ func TestProvisionerd(t *testing.T) {
179179
})
180180

181181
t.Run("TooLargeTar", func(t *testing.T) {
182-
// Ensures tars with "../../../etc/passwd" as the path
183-
// are not allowed to run, and will fail the job.
184182
t.Parallel()
185183
done := make(chan struct{})
186184
t.Cleanup(func() {
@@ -193,7 +191,7 @@ func TestProvisionerd(t *testing.T) {
193191
JobId: "test",
194192
Provisioner: "someprovisioner",
195193
TemplateSourceArchive: testutil.CreateTar(t, map[string]string{
196-
"toolarge.txt": string(make([]byte, 10*1024*1024)),
194+
"toolarge.txt": string(make([]byte, 4*1024*1024)),
197195
}),
198196
Type: &proto.AcquiredJob_TemplateImport_{
199197
TemplateImport: &proto.AcquiredJob_TemplateImport{
@@ -215,7 +213,7 @@ func TestProvisionerd(t *testing.T) {
215213
}, provisionerd.LocalProvisioners{
216214
"someprovisioner": createProvisionerClient(t, done, provisionerTestServer{}),
217215
})
218-
require.Condition(t, closedWithin(completeChan, testutil.WaitMedium))
216+
require.Condition(t, closedWithin(completeChan, testutil.WaitSuperLong*100))
219217
require.NoError(t, closer.Close())
220218
})
221219

provisionersdk/serve.go

+12-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ import (
1111
"github.com/valyala/fasthttp/fasthttputil"
1212
"golang.org/x/xerrors"
1313
"storj.io/drpc"
14+
"storj.io/drpc/drpcmanager"
1415
"storj.io/drpc/drpcmux"
1516
"storj.io/drpc/drpcserver"
17+
"storj.io/drpc/drpcwire"
1618

1719
"cdr.dev/slog"
1820

@@ -81,7 +83,16 @@ func Serve(ctx context.Context, server Server, options *ServeOptions) error {
8183
if err != nil {
8284
return xerrors.Errorf("register provisioner: %w", err)
8385
}
84-
srv := drpcserver.New(&tracing.DRPCHandler{Handler: mux})
86+
srv := drpcserver.NewWithOptions(
87+
&tracing.DRPCHandler{Handler: mux},
88+
drpcserver.Options{
89+
Manager: drpcmanager.Options{
90+
Reader: drpcwire.ReaderOptions{
91+
MaximumBufferSize: 0,
92+
},
93+
},
94+
Log: nil,
95+
})
8596

8697
if options.Listener != nil {
8798
err = srv.Serve(ctx, options.Listener)

0 commit comments

Comments
 (0)