Revert "To adhere with protocol the server should send RST_STREAM on …

…observing timeout on a strea, (#1130)" This reverts commit 6d0e6b0.
grpc · Apr 21, 2017 · ef10a56 · ef10a56
1 parent 2d949be
commit ef10a56
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/transport/http2_client.go b/transport/http2_client.go
@@ -560,12 +560,9 @@ func (t *http2Client) CloseStream(s *Stream, err error) {
 	}
 	s.state = streamDone
 	s.mu.Unlock()
-	if se, ok := err.(StreamError); ok {
+	if _, ok := err.(StreamError); ok {
 		rstStream = true
 		rstError = http2.ErrCodeCancel
-		if se.Code == codes.DeadlineExceeded {
-			rstError = http2.ErrCodeInternal
-		}
 	}
 }
 

diff --git a/transport/http2_server.go b/transport/http2_server.go
@@ -741,9 +741,6 @@ func (t *http2Server) WriteStatus(s *Stream, st *status.Status) error {
 		}
 		t.stats.HandleRPC(s.Context(), outTrailer)
 	}
-	if statusCode == codes.DeadlineExceeded {
-		t.controlBuf.put(&resetStream{s.id, http2.ErrCodeInternal})
-	}
 	t.closeStream(s)
 	t.writableChan <- 0
 	return nil