Merge pull request #95070 from cockroachdb/blathers/backport-release-…

…22.2-91619 release-22.2: changefeedccl: fix deadlock in mocksyncproducer
cockroachdb · Jan 11, 2023 · 4c573eb · 4c573eb
2 parents d91d145 + 4808c4d
commit 4c573eb
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
@@ -1320,7 +1320,10 @@ func (s *fakeKafkaSink) Dial() error {
 						return err
 					}
 				}
-				s.feedCh <- m
+				select {
+				case s.feedCh <- m:
+				case <-s.tg.done:
+				}
 				return nil
 			},
 		}}, nil