VOL-1460 Updated core to use voltha-protos instead of local protos
Moved protos to python directory in order to maintain functionaly of containers built there.
Added capability to do local builds of protos
Added instructions on running dep ensure for getting protos.
Updated github.com/golang/protobuf version to v1.3.1
Change-Id: Ia6ef55f07f0d5dcb5b750d7c37b21b71db85bfc4
diff --git a/vendor/google.golang.org/grpc/internal/transport/http2_server.go b/vendor/google.golang.org/grpc/internal/transport/http2_server.go
index df27403..d038b2d 100644
--- a/vendor/google.golang.org/grpc/internal/transport/http2_server.go
+++ b/vendor/google.golang.org/grpc/internal/transport/http2_server.go
@@ -1004,45 +1004,74 @@
return err
}
+// deleteStream deletes the stream s from transport's active streams.
+func (t *http2Server) deleteStream(s *Stream, eosReceived bool) {
+ t.mu.Lock()
+ if _, ok := t.activeStreams[s.id]; !ok {
+ t.mu.Unlock()
+ return
+ }
+
+ delete(t.activeStreams, s.id)
+ if len(t.activeStreams) == 0 {
+ t.idle = time.Now()
+ }
+ t.mu.Unlock()
+
+ if channelz.IsOn() {
+ if eosReceived {
+ atomic.AddInt64(&t.czData.streamsSucceeded, 1)
+ } else {
+ atomic.AddInt64(&t.czData.streamsFailed, 1)
+ }
+ }
+}
+
// closeStream clears the footprint of a stream when the stream is not needed
// any more.
func (t *http2Server) closeStream(s *Stream, rst bool, rstCode http2.ErrCode, hdr *headerFrame, eosReceived bool) {
- if s.swapState(streamDone) == streamDone {
- // If the stream was already done, return.
- return
- }
+ // Mark the stream as done
+ oldState := s.swapState(streamDone)
+
// In case stream sending and receiving are invoked in separate
// goroutines (e.g., bi-directional streaming), cancel needs to be
// called to interrupt the potential blocking on other goroutines.
s.cancel()
+
+ // Deletes the stream from active streams
+ t.deleteStream(s, eosReceived)
+
cleanup := &cleanupStream{
streamID: s.id,
rst: rst,
rstCode: rstCode,
- onWrite: func() {
- t.mu.Lock()
- if t.activeStreams != nil {
- delete(t.activeStreams, s.id)
- if len(t.activeStreams) == 0 {
- t.idle = time.Now()
- }
- }
- t.mu.Unlock()
- if channelz.IsOn() {
- if eosReceived {
- atomic.AddInt64(&t.czData.streamsSucceeded, 1)
- } else {
- atomic.AddInt64(&t.czData.streamsFailed, 1)
- }
- }
- },
+ onWrite: func() {},
}
- if hdr != nil {
- hdr.cleanup = cleanup
- t.controlBuf.put(hdr)
- } else {
+
+ // No trailer. Puts cleanupFrame into transport's control buffer.
+ if hdr == nil {
t.controlBuf.put(cleanup)
+ return
}
+
+ // We do the check here, because of the following scenario:
+ // 1. closeStream is called first with a trailer. A trailer item with a piggybacked cleanup item
+ // is put to control buffer.
+ // 2. Loopy writer is waiting on a stream quota. It will never get it because client errored at
+ // some point. So loopy can't act on trailer
+ // 3. Client sends a RST_STREAM due to the error. Then closeStream is called without a trailer as
+ // the result of the received RST_STREAM.
+ // If we do this check at the beginning of the closeStream, then we won't put a cleanup item in
+ // response to received RST_STREAM into the control buffer and outStream in loopy writer will
+ // never get cleaned up.
+
+ // If the stream is already done, don't send the trailer.
+ if oldState == streamDone {
+ return
+ }
+
+ hdr.cleanup = cleanup
+ t.controlBuf.put(hdr)
}
func (t *http2Server) RemoteAddr() net.Addr {
@@ -1155,7 +1184,7 @@
}
func (t *http2Server) getOutFlowWindow() int64 {
- resp := make(chan uint32)
+ resp := make(chan uint32, 1)
timer := time.NewTimer(time.Second)
defer timer.Stop()
t.controlBuf.put(&outFlowControlSizeRequest{resp})