Skip to content

streamhelper: don't cut down connection when subscription stream closed #59559

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

Merged
merged 2 commits into from
Mar 11, 2025
Merged

streamhelper: don't cut down connection when subscription stream closed #59559

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
bc84135
don't cut down connection when subscription stream closed
YuJuncen Feb 14, 2025
7ff4b77
make bazel prepare
YuJuncen Feb 19, 2025
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
2 changes: 1 addition & 1 deletion br/pkg/streamhelper/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ go_test(
],
flaky = True,
race = "on",
shard_count = 35,
shard_count = 36,
deps = [
":streamhelper",
"//br/pkg/errors",
Expand Down
5 changes: 1 addition & 4 deletions br/pkg/streamhelper/flush_subscriber.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ package streamhelper

import (
"context"
"io"
"strconv"
"sync"
"time"
Expand Down Expand Up @@ -278,12 +277,10 @@ func (s *subscription) listenOver(ctx context.Context, cli eventStream) {
// Shall we use RecvMsg for better performance?
// Note that the spans.Full requires the input slice be immutable.
msg, err := cli.Recv()
failpoint.InjectCall("listen_flush_stream", s.storeID, &err)
if err != nil {
logutil.CL(ctx).Info("Listen stopped.",
zap.Uint64("store", storeID), logutil.ShortError(err))
if err == io.EOF || err == context.Canceled || status.Code(err) == codes.Canceled {
return
}
s.emitError(errors.Annotatef(err, "while receiving from store id %d", storeID))
return
}
Expand Down
26 changes: 26 additions & 0 deletions br/pkg/streamhelper/subscription_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"testing"
"time"

"github.com/pingcap/failpoint"
"github.com/pingcap/tidb/br/pkg/streamhelper"
"github.com/pingcap/tidb/br/pkg/streamhelper/spans"
"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -240,3 +241,28 @@ func TestSomeOfStoreUnsupported(t *testing.T) {
req.NoError(err)
req.Equal(cp, s.MinValue())
}

func TestEncounterError(t *testing.T) {
req := require.New(t)
ctx := context.Background()
c := createFakeCluster(t, 4, true)
c.splitAndScatter("0001", "0002", "0003", "0008", "0009", "0010", "0100", "0956", "1000")

sub := streamhelper.NewSubscriber(c, c)
installSubscribeSupport(c)
req.NoError(sub.UpdateStoreTopology(ctx))

o := new(sync.Once)
failpoint.EnableCall("github.com/pingcap/tidb/br/pkg/streamhelper/listen_flush_stream", func(storeID uint64, err *error) {
o.Do(func() {
*err = context.Canceled
})
})

c.flushAll()
require.Eventually(t, func() bool {
return sub.PendingErrors() != nil
}, 3*time.Second, 100*time.Millisecond)
sub.HandleErrors(context.Background())
require.NoError(t, sub.PendingErrors())
}
Loading