[tools] internal/jsonrpc2: consider ErrClosedPipe as a closing error
1 view
Skip to first unread message
Robert Findley (Gerrit)
May 18, 2021, 2:22:00 PM5/18/21
to goph...@pubsubhelper.golang.org, golang-...@googlegroups.com, Ian Cottrell, Go Bot, kokoro, golang-co...@googlegroups.com
Robert Findley submitted this change.
Approvals:
Ian Cottrell: Looks good to me, approved
Robert Findley: Trusted; Run TryBots
Go Bot: TryBots succeeded
kokoro: gopls CI succeeded
internal/jsonrpc2_v2: consider ErrClosedPipe as a closing error
There was already handling in isClosingErr for errors from Stdin/Stdout
and TCP connections. Add handling for io.Pipe closing errors.
Change-Id: I8d171ab49a3fffe0fca9f0482f6b92d61b1fae1f
Reviewed-on: https://go-review.googlesource.com/c/tools/+/320849
Trust: Robert Findley <rfin...@google.com>
Run-TryBot: Robert Findley <rfin...@google.com>
gopls-CI: kokoro <noreply...@google.com>
TryBot-Result: Go Bot <go...@golang.org>
Reviewed-by: Ian Cottrell <ianco...@google.com>
---
M internal/jsonrpc2_v2/serve.go
M internal/jsonrpc2_v2/serve_test.go
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/internal/jsonrpc2_v2/serve.go b/internal/jsonrpc2_v2/serve.go
index 78259b1..20cc378 100644
--- a/internal/jsonrpc2_v2/serve.go
+++ b/internal/jsonrpc2_v2/serve.go
@@ -133,16 +133,21 @@
if err == nil {
return false
}
- // fully unwrap the error, so the following tests work
+ // Fully unwrap the error, so the following tests work.
for wrapped := err; wrapped != nil; wrapped = errors.Unwrap(err) {
err = wrapped
}
- // was it based on an EOF error?
+ // Was it based on an EOF error?
if err == io.EOF {
return true
}
+ // Was it based on a closed pipe?
+ if err == io.ErrClosedPipe {
+ return true
+ }
+
// Per https://github.com/golang/go/issues/4373, this error string should not
// change. This is not ideal, but since the worst that could happen here is
// some superfluous logging, it is acceptable.
diff --git a/internal/jsonrpc2_v2/serve_test.go b/internal/jsonrpc2_v2/serve_test.go
index 22f18cd..7f1dbc3 100644
--- a/internal/jsonrpc2_v2/serve_test.go
+++ b/internal/jsonrpc2_v2/serve_test.go
@@ -99,11 +99,11 @@
if err != nil {
t.Fatal(err)
}
- conn, shutdown, err := newFake(ctx, fake)
+ conn, shutdown, err := newFake(t, ctx, fake)
if err != nil {
t.Fatal(err)
}
- defer shutdown(ctx)
+ defer shutdown()
var got msg
if err := conn.Call(ctx, "ping", &msg{"ting"}).Await(ctx, &got); err != nil {
t.Fatal(err)
@@ -115,7 +115,7 @@
}
}
-func newFake(ctx context.Context, l jsonrpc2.Listener) (*jsonrpc2.Connection, func(context.Context), error) {
+func newFake(t *testing.T, ctx context.Context, l jsonrpc2.Listener) (*jsonrpc2.Connection, func(), error) {
l = jsonrpc2.NewIdleListener(100*time.Millisecond, l)
server, err := jsonrpc2.Serve(ctx, l, jsonrpc2.ConnectionOptions{
Handler: fakeHandler{},
@@ -132,9 +132,13 @@
if err != nil {
return nil, nil, err
}
- return client, func(ctx context.Context) {
- l.Close()
- client.Close()
+ return client, func() {
+ if err := l.Close(); err != nil {
+ t.Fatal(err)
+ }
+ if err := client.Close(); err != nil {
+ t.Fatal(err)
+ }
server.Wait()
}, nil
}
To view, visit change 320849. To unsubscribe, or for help writing mail filters, visit settings.
Reply all
Reply to author
Forward
0 new messages