Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rangefeed: fix sendMetadata deadlock #123519

Merged
merged 2 commits into from
May 6, 2024
Merged

rangefeed: fix sendMetadata deadlock #123519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22c698a
rangefeed: fix sendMetadata deadlock
msbutler May 2, 2024
b8f821a
streamingccl: use mutex to buffer split point in event stream
msbutler May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkg/ccl/streamingccl/streamproducer/event_stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,13 @@ func (s *eventStream) onMetadata(ctx context.Context, metadata *kvpb.RangeFeedMe
if metadata.FromManualSplit && !metadata.Span.Key.Equal(metadata.ParentStartKey) {
// Only send new manual split keys (i.e. a child rangefeed start key that
// differs from the parent start key)
if s.addMu != nil {
// Split points can be sent concurrently during the initial scan.
s.addMu.Lock()
defer s.addMu.Unlock()
}
s.seb.addSplitPoint(metadata.Span.Key)
s.setErr(s.maybeFlushBatch(ctx))
}
}

Expand Down
4 changes: 3 additions & 1 deletion pkg/kv/kvclient/kvcoord/dist_sender_mux_rangefeed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,9 @@ func (m *rangefeedMuxer) startSingleRangeFeed(
if m.cfg.withMetadata {
// Send metadata after the stream successfully registers to avoid sending
// metadata about a rangefeed that never starts.
sendMetadata(m.eventCh, span, parentRangefeedMetadata)
if err := sendMetadata(ctx, m.eventCh, span, parentRangefeedMetadata); err != nil {
return err
}
}

return nil
Expand Down
18 changes: 14 additions & 4 deletions pkg/kv/kvclient/kvcoord/dist_sender_rangefeed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,9 @@ func (ds *DistSender) RangeFeedSpans(
})

if cfg.withMetadata {
sendMetadata(eventCh, span, sri.parentRangeFeedMetadata)
if err := sendMetadata(ctx, eventCh, span, sri.parentRangeFeedMetadata); err != nil {
return err
}
}

case <-ctx.Done():
Expand Down Expand Up @@ -520,9 +522,13 @@ type parentRangeFeedMetadata struct {
}

func sendMetadata(
eventCh chan<- RangeFeedMessage, span roachpb.Span, parentMetadata parentRangeFeedMetadata,
) {
eventCh <- RangeFeedMessage{
ctx context.Context,
eventCh chan<- RangeFeedMessage,
span roachpb.Span,
parentMetadata parentRangeFeedMetadata,
) error {
select {
case eventCh <- RangeFeedMessage{
RangeFeedEvent: &kvpb.RangeFeedEvent{
Metadata: &kvpb.RangeFeedMetadata{
Span: span,
Expand All @@ -531,6 +537,10 @@ func sendMetadata(
},
},
RegisteredSpan: span,
}:
return nil
case <-ctx.Done():
return ctx.Err()
}
}

Expand Down
Loading