Handle ctx err in writeheader

grpc · Apr 4, 2022 · 4811f7a · 4811f7a
1 parent 0066bf6
commit 4811f7a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/internal/transport/http2_server.go b/internal/transport/http2_server.go
@@ -1065,6 +1065,9 @@ func (t *http2Server) Write(s *Stream, hdr []byte, data []byte, opts *Options) e
 			if _, ok := err.(ConnectionError); ok {
 				return err
 			}
+			if s.ctx.Err() != nil {
+				return ContextErr(s.ctx.Err())
+			}
 			// TODO(mmukhi, dfawley): Make sure this is the right code to return.
 			return status.Errorf(codes.Internal, "transport: %v", err)
 		}

diff --git a/test/end2end_test.go b/test/end2end_test.go
@@ -4964,7 +4964,7 @@ func testClientSendDataAfterCloseSend(t *testing.T, e env) {
 		}
 		if err := stream.SendMsg(nil); err == nil {
 			t.Error("expected error sending message on stream after stream closed due to illegal data")
-		} else if status.Code(err) != codes.Internal {
+		} else if status.Code(err) != codes.Canceled {
 			t.Errorf("expected internal error, instead received '%v'", err)
 		}
 		return nil