Skip to content

Commit 54e9027

Browse files
craig[bot]wenyihu6
andcommitted
Merge #148239
148239: kvserver: remove logging "stream sender is stopped" r=stevendanna a=wenyihu6 Previously, we logged an error every time SendBuffered failed, which happens after the buffered sender has been stopped. When gRPC shuts down, buffered sender would be stopped, and registrations are signaled to disconnect and would attempt to send error messages back to the an already stopped sender, resulting in noisy error logs. This patch removes this log line and adds a new vmodule log line during streamManager.Stop(). Epic: none Release note: none Co-authored-by: wenyihu6 <[email protected]>
2 parents bb1c098 + 54f199a commit 54e9027

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

pkg/kv/kvserver/rangefeed/stream.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,9 @@ func (s *PerRangeEventSink) SendError(err *kvpb.Error) {
8989
log.KvDistribution.Fatalf(context.Background(),
9090
"unexpected: SendWithoutBlocking called with non-error event")
9191
}
92-
if err := s.wrapped.sendBuffered(ev, nil); err != nil {
93-
log.KvDistribution.Infof(context.Background(),
94-
"failed to send rangefeed error to client: %v", err)
95-
}
92+
// Silence the error: expected to happen when the buffered sender is closed or
93+
// stopped.
94+
_ = s.wrapped.sendBuffered(ev, nil)
9695
}
9796

9897
// transformRangefeedErrToClientError converts a rangefeed error to a client

pkg/kv/kvserver/rangefeed/stream_manager.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ func (sm *StreamManager) Stop(ctx context.Context) {
197197
sm.sender.cleanup(ctx)
198198
sm.streams.Lock()
199199
defer sm.streams.Unlock()
200+
log.KvDistribution.VInfof(ctx, 2, "stopping stream manager: disconnecting %d streams", len(sm.streams.m))
200201
rangefeedClosedErr := kvpb.NewError(
201202
kvpb.NewRangeFeedRetryError(kvpb.RangeFeedRetryError_REASON_RANGEFEED_CLOSED))
202203
sm.metrics.ActiveMuxRangeFeed.Dec(int64(len(sm.streams.m)))

0 commit comments

Comments
 (0)