Skip to content

pkg/util/workloadrepo: stabilize flaky TestCreatePartition #67793

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 2 commits into
base: master
Choose a base branch
from
+38 −16
Open

pkg/util/workloadrepo: stabilize flaky TestCreatePartition #67793

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
af4b5ca
fix: stabilize flaky issue #67461
flaky-claw Apr 15, 2026
4310e3e
pkg/util/workloadrepo: address review comments
yinsustart May 9, 2026
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: 2 additions & 0 deletions pkg/util/workloadrepo/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ go_test(
"//pkg/parser/ast",
"//pkg/parser/auth",
"//pkg/parser/mysql",
"//pkg/session",
"//pkg/session/sessionapi",
"//pkg/sessionctx",
"//pkg/sessionctx/variable",
"//pkg/testkit",
Expand Down
52 changes: 36 additions & 16 deletions pkg/util/workloadrepo/worker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ import (
"github.com/pingcap/tidb/pkg/parser/ast"
"github.com/pingcap/tidb/pkg/parser/auth"
"github.com/pingcap/tidb/pkg/parser/mysql"
"github.com/pingcap/tidb/pkg/session"
"github.com/pingcap/tidb/pkg/session/sessionapi"
"github.com/pingcap/tidb/pkg/sessionctx"
"github.com/pingcap/tidb/pkg/sessionctx/variable"
"github.com/pingcap/tidb/pkg/testkit"
Expand Down Expand Up @@ -632,20 +634,34 @@ func buildPartitionString(partitions []time.Time) string {
return sb.String()
}

func createTableWithParts(ctx context.Context, t *testing.T, tk *testkit.TestKit, tbl *repositoryTable,
sess sessionctx.Context, partitions []time.Time) {
func createTableWithPartsByExec(ctx context.Context, t *testing.T, tbl *repositoryTable,
sess sessionctx.Context, partitions []time.Time, exec func(string)) {
createSQL, err := buildCreateQuery(ctx, sess, tbl)
require.NoError(t, err)
createSQL += buildPartitionString(partitions)
tk.MustExec(createSQL)
exec(createSQL)
require.True(t, validatePartitionsMatchExpected(ctx, t, sess, tbl, partitions))
}

func createTableWithParts(ctx context.Context, t *testing.T, tk *testkit.TestKit, tbl *repositoryTable,
sess sessionctx.Context, partitions []time.Time) {
createTableWithPartsByExec(ctx, t, tbl, sess, partitions, func(createSQL string) {
tk.MustExec(createSQL)
})
}

func createTableWithPartsForSession(ctx context.Context, t *testing.T, se sessionapi.Session, tbl *repositoryTable,
sess sessionctx.Context, partitions []time.Time) {
createTableWithPartsByExec(ctx, t, tbl, sess, partitions, func(createSQL string) {
session.MustExec(t, se, createSQL)
})
}

func validatePartitionCreation(ctx context.Context, now time.Time, t *testing.T,
sess sessionctx.Context, tk *testkit.TestKit, wrk *worker,
sess sessionctx.Context, se sessionapi.Session, wrk *worker,
firstTestFails bool, tableName string, partitions []time.Time, expectedParts []time.Time) {
tbl := getTable(t, tableName, wrk)
createTableWithParts(ctx, t, tk, tbl, sess, partitions)
createTableWithPartsForSession(ctx, t, se, tbl, sess, partitions)

is := sess.GetLatestInfoSchema().(infoschema.InfoSchema)
require.False(t, firstTestFails == checkTableExistsByIS(ctx, is, tbl.destTable, now))
Expand All @@ -662,56 +678,60 @@ func validatePartitionCreation(ctx context.Context, now time.Time, t *testing.T,
func TestCreatePartition(t *testing.T) {
ctx, store, dom, addr := setupDomainAndContext(t)
wrk := setupWorker(ctx, t, addr, dom, "worker", true)
tk := testkit.NewTestKit(t, store)
se, err := session.CreateSession4Test(store)
require.NoError(t, err)
t.Cleanup(se.Close)

tk.MustExec("create database WORKLOAD_SCHEMA")
tk.MustExec("use WORKLOAD_SCHEMA")
session.MustExec(t, se, "create database WORKLOAD_SCHEMA")
session.MustExec(t, se, "use WORKLOAD_SCHEMA")

_sessctx := wrk.getSessionWithRetry()
sess := _sessctx.(sessionctx.Context)

wrk.fillInTableNames()

now := time.Now()
// The test builds date-based partitions with AddDate and TO_DAYS, so anchor at noon to avoid
// instability around wall-clock day boundaries.
now = time.Date(now.Year(), now.Month(), now.Day(), 12, 0, 0, 0, now.Location())

/* Tables without partitions are not currently supported. */

// Should create one partition for today and tomorrow on a table with only old partitions before today.
partitions := []time.Time{now.AddDate(0, 0, -1)}
expectedParts := []time.Time{now.AddDate(0, 0, -1), now, now.AddDate(0, 0, 1)}
validatePartitionCreation(ctx, now, t, sess, tk, wrk, true, "PROCESSLIST", partitions, expectedParts)
validatePartitionCreation(ctx, now, t, sess, se, wrk, true, "PROCESSLIST", partitions, expectedParts)

// Should create one partition for tomorrow on a table with only a partition for today.
partitions = []time.Time{now}
expectedParts = []time.Time{now, now.AddDate(0, 0, 1)}
validatePartitionCreation(ctx, now, t, sess, tk, wrk, true, "DATA_LOCK_WAITS", partitions, expectedParts)
validatePartitionCreation(ctx, now, t, sess, se, wrk, true, "DATA_LOCK_WAITS", partitions, expectedParts)

// Should not create any partitions on a table with only a partition for tomorrow.
partitions = []time.Time{now.AddDate(0, 0, 1)}
expectedParts = []time.Time{now.AddDate(0, 0, 1)}
validatePartitionCreation(ctx, now, t, sess, tk, wrk, false, "TIDB_TRX", partitions, expectedParts)
validatePartitionCreation(ctx, now, t, sess, se, wrk, false, "TIDB_TRX", partitions, expectedParts)

// Should not create any partitions on a table with only partitions for both today and tomorrow.
partitions = []time.Time{now, now.AddDate(0, 0, 1)}
expectedParts = []time.Time{now, now.AddDate(0, 0, 1)}
validatePartitionCreation(ctx, now, t, sess, tk, wrk, false, "MEMORY_USAGE", partitions, expectedParts)
validatePartitionCreation(ctx, now, t, sess, se, wrk, false, "MEMORY_USAGE", partitions, expectedParts)

// Should not create any partitions on a table with a partition for the day after tomorrow.
partitions = []time.Time{now.AddDate(0, 0, 2)}
expectedParts = []time.Time{now.AddDate(0, 0, 2)}
validatePartitionCreation(ctx, now, t, sess, tk, wrk, false, "DEADLOCKS", partitions, expectedParts)
validatePartitionCreation(ctx, now, t, sess, se, wrk, false, "DEADLOCKS", partitions, expectedParts)

// Should not fill in missing partitions on a table with a partition for dates beyond tomorrow.
partitions = []time.Time{now, now.AddDate(0, 0, 3)}
expectedParts = []time.Time{now, now.AddDate(0, 0, 3)}
validatePartitionCreation(ctx, now, t, sess, tk, wrk, false, "TIDB_INDEX_USAGE", partitions, expectedParts)
validatePartitionCreation(ctx, now, t, sess, se, wrk, false, "TIDB_INDEX_USAGE", partitions, expectedParts)

// this table should be updated when the repository is enabled
partitions = []time.Time{now}
createTableWithParts(ctx, t, tk, getTable(t, "TIDB_STATEMENTS_STATS", wrk), sess, partitions)
createTableWithPartsForSession(ctx, t, se, getTable(t, "TIDB_STATEMENTS_STATS", wrk), sess, partitions)

// turn on the repository and see if it creates the remaining tables
now = time.Now()
wrk.setRepositoryDest(ctx, "table")
waitForTables(ctx, t, wrk, now)
}
Expand Down
Loading