Update ttrpc for client timeout support

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2018-09-20 15:28:52 -04:00
parent 16b42fce94
commit d16cc3a02e
3 changed files with 6 additions and 2 deletions

View File

@ -36,7 +36,7 @@ github.com/Microsoft/go-winio v0.4.10
github.com/Microsoft/hcsshim 44c060121b68e8bdc40b411beba551f3b4ee9e55 github.com/Microsoft/hcsshim 44c060121b68e8bdc40b411beba551f3b4ee9e55
google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944 google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4 golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
github.com/containerd/ttrpc 94dde388801693c54f88a6596f713b51a8b30b2d github.com/containerd/ttrpc 2a805f71863501300ae1976d29f0454ae003e85a
github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16 github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16
gotest.tools v2.1.0 gotest.tools v2.1.0
github.com/google/go-cmp v0.1.0 github.com/google/go-cmp v0.1.0

View File

@ -110,12 +110,16 @@ func (c *Client) dispatch(ctx context.Context, req *Request, resp *Response) err
} }
select { select {
case <-ctx.Done():
return ctx.Err()
case c.calls <- call: case c.calls <- call:
case <-c.done: case <-c.done:
return c.err return c.err
} }
select { select {
case <-ctx.Done():
return ctx.Err()
case err := <-errs: case err := <-errs:
return filterCloseErr(err) return filterCloseErr(err)
case <-c.done: case <-c.done:

View File

@ -127,13 +127,13 @@ func (s *Server) Serve(ctx context.Context, l net.Listener) error {
func (s *Server) Shutdown(ctx context.Context) error { func (s *Server) Shutdown(ctx context.Context) error {
s.mu.Lock() s.mu.Lock()
lnerr := s.closeListeners()
select { select {
case <-s.done: case <-s.done:
default: default:
// protected by mutex // protected by mutex
close(s.done) close(s.done)
} }
lnerr := s.closeListeners()
s.mu.Unlock() s.mu.Unlock()
ticker := time.NewTicker(200 * time.Millisecond) ticker := time.NewTicker(200 * time.Millisecond)