Skip to content

test: stabilize flaky TestFlashbackClusterWithManyDBs #70057

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

Open
flaky-claw wants to merge 1 commit into
base: master
Choose a base branch
from
+88 −6
Open

test: stabilize flaky TestFlashbackClusterWithManyDBs #70057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/executor/test/recovertest/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,17 @@ go_test(
deps = [
"//pkg/config",
"//pkg/config/kerneltype",
"//pkg/domain",
"//pkg/ddl/util",
Comment on lines +15 to 16

@coderabbitai coderabbitai Bot Jul 24, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📐 Maintainability & Code Quality | 🟠 Major | ⚡ Quick win

Dep list out of alphabetical order — likely cause of the bazel_prepare failure.

//pkg/domain (line 15) is listed before //pkg/ddl/util (line 16), but "ddl" sorts before "domain" lexically. Gazelle-generated deps lists are alphabetically sorted, and the PR description notes bazel_prepare failed — this ordering mismatch is a likely culprit.

🔧 Proposed fix 
         "//pkg/config",
         "//pkg/config/kerneltype",
-        "//pkg/domain",
         "//pkg/ddl/util",
+        "//pkg/domain",
         "//pkg/errno",
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
"//pkg/domain",
"//pkg/ddl/util",
"//pkg/ddl/util",
"//pkg/domain",
🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@pkg/executor/test/recovertest/BUILD.bazel` around lines 15 - 16, Reorder the
deps entries in the test target’s BUILD definition so //pkg/ddl/util appears
before //pkg/domain, preserving Gazelle’s lexical alphabetical ordering and
leaving all other dependencies unchanged.

"//pkg/errno",
"//pkg/infoschema",
"//pkg/kv",
"//pkg/meta/autoid",
"//pkg/meta/model",
"//pkg/parser/auth",
"//pkg/resourcemanager",
"//pkg/session",
"//pkg/sessionctx/vardef",
"//pkg/sessionctx/variable",
"//pkg/store/mockstore",
"//pkg/testkit",
Expand All @@ -28,9 +32,11 @@ go_test(
"//pkg/util/dbterror",
"//pkg/util/gcutil",
"@com_github_pingcap_failpoint//:failpoint",
"@com_github_pingcap_kvproto//pkg/kvrpcpb",
"@com_github_stretchr_testify//require",
"@com_github_tikv_client_go_v2//oracle",
"@com_github_tikv_client_go_v2//tikv",
"@com_github_tikv_client_go_v2//tikvrpc",
"@com_github_tikv_client_go_v2//util",
"@io_opencensus_go//stats/view",
"@org_uber_go_goleak//:goleak",
Expand Down
88 changes: 82 additions & 6 deletions pkg/executor/test/recovertest/recover_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,23 @@ import (
"fmt"
"strconv"
"sync"
"sync/atomic"
"testing"
"time"

"github.com/pingcap/failpoint"
"github.com/pingcap/kvproto/pkg/kvrpcpb"
"github.com/pingcap/tidb/pkg/config/kerneltype"
ddlutil "github.com/pingcap/tidb/pkg/ddl/util"
"github.com/pingcap/tidb/pkg/domain"
"github.com/pingcap/tidb/pkg/errno"
"github.com/pingcap/tidb/pkg/infoschema"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/meta/model"
"github.com/pingcap/tidb/pkg/parser/auth"
"github.com/pingcap/tidb/pkg/resourcemanager"
"github.com/pingcap/tidb/pkg/session"
"github.com/pingcap/tidb/pkg/sessionctx/vardef"
"github.com/pingcap/tidb/pkg/sessionctx/variable"
"github.com/pingcap/tidb/pkg/store/mockstore"
"github.com/pingcap/tidb/pkg/testkit"
Expand All @@ -40,7 +46,10 @@ import (
"github.com/pingcap/tidb/pkg/util/gcutil"
"github.com/stretchr/testify/require"
"github.com/tikv/client-go/v2/oracle"
"github.com/tikv/client-go/v2/tikv"
"github.com/tikv/client-go/v2/tikvrpc"
tikvutil "github.com/tikv/client-go/v2/util"
"go.opencensus.io/stats/view"
)

func TestRecoverTable(t *testing.T) {
Expand Down Expand Up @@ -721,8 +730,79 @@ func mockGC(tk *testkit.TestKit) (string, string, string, func()) {
return timeBeforeDrop, timeAfterDrop, safePointSQL, resetGC
}

type flashbackClusterTestClient struct {
tikv.Client
}

func (c *flashbackClusterTestClient) SendRequest(ctx context.Context, addr string, req *tikvrpc.Request, timeout time.Duration) (*tikvrpc.Response, error) {
switch req.Type {
case tikvrpc.CmdPrepareFlashbackToVersion:
return &tikvrpc.Response{Resp: &kvrpcpb.PrepareFlashbackToVersionResponse{}}, nil
case tikvrpc.CmdFlashbackToVersion:
return &tikvrpc.Response{Resp: &kvrpcpb.FlashbackToVersionResponse{}}, nil
default:
return c.Client.SendRequest(ctx, addr, req, timeout)
}
}

type flashbackClusterTestStorage interface {
kv.Storage
tikv.Storage
kv.StorageWithPD
}

type flashbackClusterTestStore struct {
flashbackClusterTestStorage
minSafeTS *atomic.Uint64
}

var _ kv.StorageWithPD = (*flashbackClusterTestStore)(nil)

func newFlashbackClusterTestStore(t *testing.T, minSafeTS *atomic.Uint64) kv.Storage {
t.Helper()

store, err := mockstore.NewMockStore(
mockstore.WithStoreType(mockstore.MockTiKV),
mockstore.WithClientHijacker(func(client tikv.Client) tikv.Client {
return &flashbackClusterTestClient{Client: client}
}),
)
require.NoError(t, err)
testStore, ok := store.(flashbackClusterTestStorage)
require.True(t, ok)
wrappedStore := &flashbackClusterTestStore{
flashbackClusterTestStorage: testStore,
minSafeTS: minSafeTS,
}

vardef.SetSchemaLease(500 * time.Millisecond)
session.DisableStats4Test()
domain.DisablePlanReplayerBackgroundJob4Test()
domain.DisableDumpHistoricalStats4Test()
dom, err := session.BootstrapSession(wrappedStore)
require.NoError(t, err)
dom.SetStatsUpdating(true)
t.Cleanup(func() {
dom.Close()
view.Stop()
require.NoError(t, wrappedStore.Close())
resourcemanager.InstanceResourceManager.Reset()
})

return wrappedStore
}

func (*flashbackClusterTestStore) Name() string {
return "TiKV"
}

func (s *flashbackClusterTestStore) GetMinSafeTS(string) uint64 {
return s.minSafeTS.Load()
}

func TestFlashbackClusterWithManyDBs(t *testing.T) {
store := testkit.CreateMockStore(t)
var minSafeTS atomic.Uint64
store := newFlashbackClusterTestStore(t, &minSafeTS)
tk := testkit.NewTestKit(t, store)

timeBeforeDrop, _, safePointSQL, resetGC := mockGC(tk)
Expand Down Expand Up @@ -758,11 +838,7 @@ func TestFlashbackClusterWithManyDBs(t *testing.T) {

ts, _ := store.CurrentVersion(oracle.GlobalTxnScope)
flashbackTs := oracle.GetTimeFromTS(ts.Ver)

injectSafeTS := oracle.GoTimeToTS(flashbackTs.Add(10 * time.Second))
testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/ddl/mockFlashbackTest", `return(true)`)
testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/ddl/injectSafeTS",
fmt.Sprintf("return(%v)", injectSafeTS))
minSafeTS.Store(oracle.GoTimeToTS(flashbackTs.Add(10 * time.Second)))

// this test will fail before the fix, because the DDL job KV entry is too large.
tk.MustExec(fmt.Sprintf("flashback cluster to timestamp '%s'", flashbackTs))
Expand Down
Loading