Merge #91619

91619: changefeedccl: fix deadlock in mocksyncproducer r=samiskin a=samiskin Resolves #89028 TestChangefeedKafkaMessageTooLarge would flake sometimes with goroutines blocked on sending into the mocksyncproducer feedCh and would result in a "Slow on quiesce" error. This is likely due to the jobFeed shutting down which also shuts down the consumer of feedCh. Release note: None Co-authored-by: Shiranka Miskin <[email protected]>
cockroachdb · Nov 13, 2022 · 7f77f57 · 7f77f57
2 parents f82dead + ffbc28d
commit 7f77f57
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pkg/ccl/changefeedccl/testfeed_test.go b/pkg/ccl/changefeedccl/testfeed_test.go
@@ -1608,7 +1608,10 @@ func (s *fakeKafkaSink) Dial() error {
 						return err
 					}
 				}
-				s.feedCh <- m
+				select {
+				case s.feedCh <- m:
+				case <-s.tg.done:
+				}
 				return nil
 			},
 		}}, nil