Skip to content

fix: don't use yamux for in-memory provisioner{,d} streams #5136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 22, 2022
Merged

fix: don't use yamux for in-memory provisioner{,d} streams #5136

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b84a5f8
fix: don't use yamux for in-memory provisioner{,d} streams
coadler Nov 19, 2022
3ac047c
fixup! fix: don't use yamux for in-memory provisioner{,d} streams
coadler Nov 19, 2022
9a6ea3f
fixup! fix: don't use yamux for in-memory provisioner{,d} streams
coadler Nov 19, 2022
f659b3f
fixup! fix: don't use yamux for in-memory provisioner{,d} streams
coadler Nov 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup! fix: don't use yamux for in-memory provisioner{,d} streams
  • Loading branch information
@coadler
coadler committed Nov 19, 2022
commit 3ac047cc2cb7ccf6771cbfeb4160ccd1d5b2d7aa
4 changes: 3 additions & 1 deletion provisionersdk/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"os"

"github.com/hashicorp/yamux"
"github.com/valyala/fasthttp/fasthttputil"
"golang.org/x/xerrors"
"storj.io/drpc/drpcmux"
"storj.io/drpc/drpcserver"
Expand Down Expand Up @@ -60,7 +61,8 @@ func Serve(ctx context.Context, server proto.DRPCProvisionerServer, options *Ser
if errors.Is(err, io.EOF) ||
errors.Is(err, context.Canceled) ||
errors.Is(err, io.ErrClosedPipe) ||
errors.Is(err, yamux.ErrSessionShutdown) {
errors.Is(err, yamux.ErrSessionShutdown) ||
errors.Is(err, fasthttputil.ErrInmemoryListenerClosed) {
return nil
}

Expand Down