Permalink
Browse files

transport: fix logical race in flow control (#1005)

Remove the add and cancel methods of quotaPool. Their use is not required, and
leads to logical races when used concurrently from multiple goroutines. Rename
the reset method to add.

The typical way that a goroutine claims quota is to call the add method and
then to select on the channel returned by the acquire method. If two
goroutines are both trying to claim quota from a single quotaPool, the second
call to the add method can happen before the first attempt to read from the
channel. When that happens the second goroutine to attempt the channel read
will end up waiting for a very long time, in spite of its efforts to prepare
the channel for reading.

The quotaPool will always behave correctly when any positive quota is on the
channel rather than stored in the struct field. In the opposite case, when
positive quota is only in the struct field and not on the channel, users of
the quotaPool can fail to access available quota. Err on the side of storing
any positive quota in the channel.

This includes a reproducer for #632, which fails on many runs with this
package at v1.0.4. The frequency of the test failures depends on how stressed
the server is, since it's now effectively checking for weird interleavings of
goroutines. It passes reliably with these changes to the transport package.

The behavior described in #734 (an RPC with a streaming response hangs
unexpectedly) matches what I've seen in my programs, and what I see in the
test case added here. If it's a logical flow control bug, this change may well
fix it.

Updates #632
Updates #734
  • Loading branch information...
rhysh authored and iamqizhao committed Dec 1, 2016
1 parent deb01f4 commit 417442a753748fba8b9fade9953a9355ad570906
Showing with 122 additions and 42 deletions.
  1. +112 −0 test/end2end_test.go
  2. +6 −28 transport/control.go
  3. +3 −8 transport/http2_client.go
  4. +1 −6 transport/http2_server.go
View
@@ -3188,6 +3188,117 @@ func TestServerCredsDispatch(t *testing.T) {
}
}
+func TestFlowControlLogicalRace(t *testing.T) {
+ // Test for a regression of https://github.com/grpc/grpc-go/issues/632,
+ // and other flow control bugs.
+
+ defer leakCheck(t)()
+
+ const (
+ itemCount = 100
+ itemSize = 1 << 10
+ recvCount = 2
+ maxFailures = 3
+
+ requestTimeout = time.Second
+ )
+
+ requestCount := 10000
+ if raceMode {
+ requestCount = 1000
+ }
+
+ lis, err := net.Listen("tcp", ":0")
+ if err != nil {
+ t.Fatalf("Failed to listen: %v", err)
+ }
+ defer lis.Close()
+
+ s := grpc.NewServer()
+ testpb.RegisterTestServiceServer(s, &flowControlLogicalRaceServer{
+ itemCount: itemCount,
+ itemSize: itemSize,
+ })
+ defer s.Stop()
+
+ go s.Serve(lis)
+
+ ctx := context.Background()
+
+ cc, err := grpc.Dial(lis.Addr().String(), grpc.WithInsecure(), grpc.WithBlock())
+ if err != nil {
+ t.Fatalf("grpc.Dial(%q) = %v", lis.Addr().String(), err)
+ }
+ defer cc.Close()
+ cl := testpb.NewTestServiceClient(cc)
+
+ failures := 0
+ for i := 0; i < requestCount; i++ {
+ ctx, cancel := context.WithTimeout(ctx, requestTimeout)
+ output, err := cl.StreamingOutputCall(ctx, &testpb.StreamingOutputCallRequest{})
+ if err != nil {
+ t.Fatalf("StreamingOutputCall; err = %q", err)
+ }
+
+ j := 0
+ loop:
+ for ; j < recvCount; j++ {
+ _, err := output.Recv()
+ if err != nil {
+ if err == io.EOF {
+ break loop
+ }
+ switch grpc.Code(err) {
+ case codes.DeadlineExceeded:
+ break loop
+ default:
+ t.Fatalf("Recv; err = %q", err)
+ }
+ }
+ }
+ cancel()
+ <-ctx.Done()
+
+ if j < recvCount {
+ t.Errorf("got %d responses to request %d", j, i)
+ failures++
+ if failures >= maxFailures {
+ // Continue past the first failure to see if the connection is
+ // entirely broken, or if only a single RPC was affected
+ break
+ }
+ }
+ }
+}
+
+type flowControlLogicalRaceServer struct {
+ testpb.TestServiceServer
+
+ itemSize int
+ itemCount int
+}
+
+func (s *flowControlLogicalRaceServer) StreamingOutputCall(req *testpb.StreamingOutputCallRequest, srv testpb.TestService_StreamingOutputCallServer) error {
+ for i := 0; i < s.itemCount; i++ {
+ err := srv.Send(&testpb.StreamingOutputCallResponse{
+ Payload: &testpb.Payload{
+ // Sending a large stream of data which the client reject
+ // helps to trigger some types of flow control bugs.
+ //
+ // Reallocating memory here is inefficient, but the stress it
+ // puts on the GC leads to more frequent flow control
+ // failures. The GC likely causes more variety in the
+ // goroutine scheduling orders.
+ Body: bytes.Repeat([]byte("a"), s.itemSize),
+ },
+ })
+ if err != nil {
+ return err
+ }
+ }
+ return nil
+}
+
// interestingGoroutines returns all goroutines we care about for the purpose
// of leak checking. It excludes testing or runtime ones.
func interestingGoroutines() (gs []string) {
@@ -3208,6 +3319,7 @@ func interestingGoroutines() (gs []string) {
strings.Contains(stack, "testing.tRunner(") ||
strings.Contains(stack, "runtime.goexit") ||
strings.Contains(stack, "created by runtime.gc") ||
+ strings.Contains(stack, "created by runtime/trace.Start") ||
strings.Contains(stack, "created by google3/base/go/log.init") ||
strings.Contains(stack, "interestingGoroutines") ||
strings.Contains(stack, "runtime.MHeap_Scavenger") ||
View
@@ -111,35 +111,9 @@ func newQuotaPool(q int) *quotaPool {
return qb
}
-// add adds n to the available quota and tries to send it on acquire.
-func (qb *quotaPool) add(n int) {
- qb.mu.Lock()
- defer qb.mu.Unlock()
- qb.quota += n
- if qb.quota <= 0 {
- return
- }
- select {
- case qb.c <- qb.quota:
- qb.quota = 0
- default:
- }
-}
-
-// cancel cancels the pending quota sent on acquire, if any.
-func (qb *quotaPool) cancel() {
- qb.mu.Lock()
- defer qb.mu.Unlock()
- select {
- case n := <-qb.c:
- qb.quota += n
- default:
- }
-}
-
-// reset cancels the pending quota sent on acquired, incremented by v and sends
+// add cancels the pending quota sent on acquired, incremented by v and sends
// it back on acquire.
-func (qb *quotaPool) reset(v int) {
+func (qb *quotaPool) add(v int) {
qb.mu.Lock()
defer qb.mu.Unlock()
select {
@@ -151,6 +125,10 @@ func (qb *quotaPool) reset(v int) {
if qb.quota <= 0 {
return
}
+ // After the pool has been created, this is the only place that sends on
+ // the channel. Since mu is held at this point and any quota that was sent
+ // on the channel has been retrieved, we know that this code will always
+ // place any positive quota value on the channel.
select {
case qb.c <- qb.quota:
qb.quota = 0
View
@@ -379,7 +379,7 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
}
t.mu.Unlock()
if reset {
- t.streamsQuota.reset(-1)
+ t.streamsQuota.add(-1)
}
// HPACK encodes various headers. Note that once WriteField(...) is
@@ -622,19 +622,14 @@ func (t *http2Client) Write(s *Stream, data []byte, opts *Options) error {
var p []byte
if r.Len() > 0 {
size := http2MaxFrameLen
- s.sendQuotaPool.add(0)
// Wait until the stream has some quota to send the data.
sq, err := wait(s.ctx, s.done, s.goAway, t.shutdownChan, s.sendQuotaPool.acquire())
if err != nil {
return err
}
- t.sendQuotaPool.add(0)
// Wait until the transport has some quota to send the data.
tq, err := wait(s.ctx, s.done, s.goAway, t.shutdownChan, t.sendQuotaPool.acquire())
if err != nil {
- if _, ok := err.(StreamError); ok || err == io.EOF {
- t.sendQuotaPool.cancel()
- }
return err
}
if sq < size {
@@ -1053,13 +1048,13 @@ func (t *http2Client) applySettings(ss []http2.Setting) {
t.maxStreams = int(s.Val)
t.mu.Unlock()
if reset {
- t.streamsQuota.reset(int(s.Val) - ms)
+ t.streamsQuota.add(int(s.Val) - ms)
}
case http2.SettingInitialWindowSize:
t.mu.Lock()
for _, stream := range t.activeStreams {
// Adjust the sending quota for each stream.
- stream.sendQuotaPool.reset(int(s.Val - t.streamSendQuota))
+ stream.sendQuotaPool.add(int(s.Val - t.streamSendQuota))
}
t.streamSendQuota = s.Val
t.mu.Unlock()
@@ -637,19 +637,14 @@ func (t *http2Server) Write(s *Stream, data []byte, opts *Options) error {
return nil
}
size := http2MaxFrameLen
- s.sendQuotaPool.add(0)
// Wait until the stream has some quota to send the data.
sq, err := wait(s.ctx, nil, nil, t.shutdownChan, s.sendQuotaPool.acquire())
if err != nil {
return err
}
- t.sendQuotaPool.add(0)
// Wait until the transport has some quota to send the data.
tq, err := wait(s.ctx, nil, nil, t.shutdownChan, t.sendQuotaPool.acquire())
if err != nil {
- if _, ok := err.(StreamError); ok {
- t.sendQuotaPool.cancel()
- }
return err
}
if sq < size {
@@ -717,7 +712,7 @@ func (t *http2Server) applySettings(ss []http2.Setting) {
t.mu.Lock()
defer t.mu.Unlock()
for _, stream := range t.activeStreams {
- stream.sendQuotaPool.reset(int(s.Val - t.streamSendQuota))
+ stream.sendQuotaPool.add(int(s.Val - t.streamSendQuota))
}
t.streamSendQuota = s.Val
}

0 comments on commit 417442a

Please sign in to comment.