Skip to content

test: stabilize flaky TestInstancePlanCacheConcurrencySysbench #69639

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
Open

test: stabilize flaky TestInstancePlanCacheConcurrencySysbench #69639

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
14 changes: 6 additions & 8 deletions pkg/planner/core/casetest/instanceplancache/concurrency_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,7 @@ func (w *worker) run() {
preparedResult := w.tk.MustQuery(stmt.execStmt)
normalResult.Sort().Check(preparedResult.Sort().Rows())
} else if isDML(stmt.normalStmt) { // DML
// Deadlocks can occur when multiple workers update the same row concurrently.
// This is expected database behavior - skip the statement on deadlock.
_, err := w.tk.Exec(stmt.normalStmt)
if err != nil && strings.Contains(err.Error(), "Deadlock") {
continue
}
w.tk.MustExec(stmt.normalStmt)
w.tk.MustExec(stmt.prepStmt)
w.tk.MustExec(stmt.setStmt)
w.tk.MustExec(stmt.execStmt)
Expand All @@ -97,13 +92,16 @@ func (w *worker) run() {

func testWithWorkers(TKs []*testkit.TestKit, stmts []*testStmt) {
nStmts := make([][]*testStmt, len(TKs))
// Keep writes in one session; worker transaction progress is not synchronized,
// so splitting writes across sessions can deadlock and break normal/prepared
// symmetry after rollback.
dmlWorker := rand.Intn(len(TKs))
for _, stmt := range stmts {
if stmt == nil {
continue
}
if isDML(stmt.normalStmt) { // avoid duplicate DML
x := rand.Intn(len(TKs))
nStmts[x] = append(nStmts[x], stmt)
nStmts[dmlWorker] = append(nStmts[dmlWorker], stmt)
} else {
for i := range TKs {
nStmts[i] = append(nStmts[i], stmt)
Expand Down
Loading