Merge #37986

37986: storage: avoid deadlock on (*Stopper).Quiesce r=nvanbenschoten a=tbg See #37954 (comment). Closes #37954. Release note: None Co-authored-by: Tobias Schottdorf <[email protected]>
cockroachdb · Jun 4, 2019 · 6621937 · 6621937
2 parents 55c049b + a0d0daf
commit 6621937
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pkg/storage/closedts/provider/provider.go b/pkg/storage/closedts/provider/provider.go
@@ -275,6 +275,8 @@ func (p *Provider) Subscribe(ctx context.Context, ch chan<- ctpb.Entry) {
 		for _, entry := range entries {
 			select {
 			case ch <- entry:
+			case <-p.cfg.Stopper.ShouldQuiesce():
+				return
 			case <-ctx.Done():
 				return
 			}
@@ -324,6 +326,8 @@ func (p *Provider) Subscribe(ctx context.Context, ch chan<- ctpb.Entry) {
 
 			select {
 			case ch <- entry:
+			case <-p.cfg.Stopper.ShouldQuiesce():
+				return
 			case <-ctx.Done():
 				return
 			}