Skip to content
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.

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

*: Provide a util to "pause" session in uint test #35529

Merged
merged 32 commits into from
Jun 24, 2022

Conversation

lcwangchao
Copy link
Collaborator

@lcwangchao lcwangchao commented Jun 20, 2022

What problem does this PR solve?

Issue Number: close #35526

Problem Summary:
Make the session be able to "pause" during uint test.

What is changed and how it works?

This PR provide a util to pause session in uint test. If we want to do pause, we should do following things:

  1. Inject a "StopPoint" into code by using InjectSessionStopPoint
  2. In the unit test, use EnableGlobalSessionStopFailPoint to enable the related fail point.
  3. Use testkit.NewStoppableTasksRunner(t).CreateSteppedTestKit to create a new stepped testkit. Different with the normal testkit, it provides method SteppedMustQuery and SteppedMustExec to execute a sql step by step.
  4. Calltk.EnableSessionStopPoint(stopPoint1, stopPoint2, ...) before if you want to run a sql and pause it in the middle.
  5. Call tk.SteppedMustQuery or tk.SteppedMustExec to run a sql, and it will return SteppedCommandTask
  6. The returned task object will be stopped at the first stop point it meet, and you can use task.ExpectStoppedAt to check the current stop point.
  7. Use task.Continue() to make the command continue to run.

For example, if you want to test the behavior that another session updates the record after the specified stop point, you can:

// EnableGlobalSessionStopFailPoint should be called before we want to pause sessions
taskstop.EnableGlobalSessionStopFailPoint()

// Create a stepped test kit
tk := testkit.NewStoppableTasksRunner(t).CreateSteppedTestKit("name", store)

// stop1, stop2 is two stop points we pre injected
tk.EnableSessionStopPoint("stop1", "stop2")

// Execute the sql you want to test, and it will stop at the first stop point it meet
task := tk.SteppedMustQuery("select * from t where id=1 for update")
task.ExpectStopAt("stop1")

// When the task paused, we can update the record in another session
tk2.MustExec("update t set v=v+1 where id=1")

// We can use `Continue` to resume a task and it will go on and pause at next stop point
task.Continue().ExpectStopAt("stop2")

// When the task finished, it has a done status.
task.Continue().ExpectDone()

// You can use task.GetQueryResult() to get back the result of query
task.GetQueryResult().Check(...)

// Do not forget to close the stepped testkit in the end
tk.Close()

Check List

Tests

  • Unit test

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jun 20, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • tiancaiamao
  • xhebox

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jun 20, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Jun 20, 2022

Please follow PR Title Format:

  • pkg [, pkg2, pkg3]: what is changed

Or if the count of mainly changed packages are more than 3, use

  • *: what is changed

After you have format title, you can leave a comment /run-check_title to recheck it

@sre-bot
Copy link
Contributor

sre-bot commented Jun 20, 2022

@sre-bot
Copy link
Contributor

sre-bot commented Jun 20, 2022

Please follow PR Title Format:

  • pkg [, pkg2, pkg3]: what is changed

Or if the count of mainly changed packages are more than 3, use

  • *: what is changed

After you have format title, you can leave a comment /run-check_title to recheck it

@sre-bot
Copy link
Contributor

sre-bot commented Jun 20, 2022

Please follow PR Title Format:

  • pkg [, pkg2, pkg3]: what is changed

Or if the count of mainly changed packages are more than 3, use

  • *: what is changed

After you have format title, you can leave a comment /run-check_title to recheck it

@sre-bot
Copy link
Contributor

sre-bot commented Jun 20, 2022

Please follow PR Title Format:

  • pkg [, pkg2, pkg3]: what is changed

Or if the count of mainly changed packages are more than 3, use

  • *: what is changed

After you have format title, you can leave a comment /run-check_title to recheck it

@sre-bot
Copy link
Contributor

sre-bot commented Jun 20, 2022

Please follow PR Title Format:

  • pkg [, pkg2, pkg3]: what is changed

Or if the count of mainly changed packages are more than 3, use

  • *: what is changed

After you have format title, you can leave a comment /run-check_title to recheck it

@lcwangchao lcwangchao changed the title Provide a util to "Pause" session in uint test *: Provide a util to "Pause" session in uint test Jun 20, 2022
@lcwangchao
Copy link
Collaborator Author

/run-unit-test

@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jun 21, 2022
@lcwangchao
Copy link
Collaborator Author

@xhebox I've simplified the implement and PTAL again. In the current implement I put every command run in a single goruntine and Exec and MustExec will run in the main goruntine like normal TestKit . I did not embeded it into TestKit because it seems more works to make it thread safe for all the methods. So now only MustExec and MustQuery is opened to user but I think it is enough.

@lcwangchao
Copy link
Collaborator Author

/rebuild

@lcwangchao
Copy link
Collaborator Author

/run-mysql-test

@lcwangchao lcwangchao requested a review from tiancaiamao June 23, 2022 03:51
Copy link
Contributor

@xhebox xhebox left a comment

Choose a reason for hiding this comment

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

LGTM

testkit/stepped.go Outdated Show resolved Hide resolved
testkit/stepped.go Outdated Show resolved Hide resolved
@tiancaiamao
Copy link
Contributor

@lysu and I also wrote something like this in the past
https://github.com/tiancaiamao/debugger/blob/master/debugger.go
and here #22434

But there are mental burden for other programmers to learn and use the API to write test.
So in the end, most of the programmers choose to just use failpoint [+ global variable] + mutex / channel for the testing scenario. Anyway, the test code is ugly, but not too hard to comprehend.

A: Why the test code so ugly
B: Everyone do it the quick and dirty way, the logic spread over different code fragments
A: I gonna fix it by writing a lib so others use the write tests in a uniform way
...
C: Who write the test code in this way? To understand the test code, I have to read the lib implementation first.
B: Yes, now we have two problem to solve.

@lcwangchao
Copy link
Collaborator Author

@lysu and I also wrote something like this in the past https://github.com/tiancaiamao/debugger/blob/master/debugger.go and here #22434

But there are mental burden for other programmers to learn and use the API to write test. So in the end, most of the programmers choose to just use failpoint [+ global variable] + mutex / channel for the testing scenario. Anyway, the test code is ugly, but not too hard to comprehend.

A: Why the test code so ugly B: Everyone do it the quick and dirty way, the logic spread over different code fragments A: I gonna fix it by writing a lib so others use the write tests in a uniform way ... C: Who write the test code in this way? To understand the test code, I have to read the lib implementation first. B: Yes, now we have two problem to solve.

Yes, the previous implement for this PR is more abstract and independent with tidb session and testkit, but then I found it's a little hard to use in most cases because you should connect it with testkit manually. So I changed the way and make it a little easier. For example if we want to test a retry should happen it can be:

tk1 := testkit.NewSteppedTestKit(t, store)
tk2 := testkit.NewTestKit(t, store)
tk1.SteppedMustQuery("select * from t where id=1 for update").ExpectStoppedOn("beforeExecute")
tk2.MustExec("update t set v=v+1 where id=1")
tk1.Continue().ExpectStoppedOn("lockErrorRetry")
tk1.Continue().GetQueryResult().Check(testkit.Rows("1 11"))

Maybe it's easier.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 24, 2022
@lcwangchao
Copy link
Collaborator Author

/run-check_dev_2

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jun 24, 2022
@lcwangchao
Copy link
Collaborator Author

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 09d4bbd

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 24, 2022
@ti-chi-bot ti-chi-bot merged commit db02b4a into pingcap:master Jun 24, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Jun 24, 2022

TiDB MergeCI notify

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci/integration-cdc-test 🟢 all 35 tests passed 24 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 11 tests passed 18 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 12 tests passed 11 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 8 min 30 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 7 min 21 sec Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 7 min 10 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 6 min 22 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 3 min 2 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 2 min 42 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

morgo added a commit to morgo/tidb that referenced this pull request Jun 24, 2022
* upstream/master: (38 commits)
  planner: disable collate clause support for enum or set column (pingcap#35684)
  *: Provide a util to "pause" session in uint test (pingcap#35529)
  ddl: implement the core for multi-schema change (pingcap#35429)
  parser: XXXDatabaseStmt now use CIStr for DB name (pingcap#35668)
  *: remove real tikv test on github actions (pingcap#35710)
  lightning: support disable scheduler by key range (pingcap#34130)
  Revert "planner: fix the wrong cost formula of MPPExchanger" (pingcap#35707)
  ddl, owner: refresh ddl sequence cache after becoming the owner (pingcap#35516)
  store/copr: fix tiflash integration test by disable paging on tiflash (pingcap#35674)
  planner: new cost formula for IndexJoin (pingcap#35671)
  BR: fix backup ranges total time summary log (pingcap#35552)
  raw_restore: fix the issue that raw restore rewrite the t prefix keys (pingcap#35641)
  table: fix cannot find the temp table when it's created in a transaction (pingcap#35663)
  metrics: replace histogram with counter for  DistSQLCoprCache (pingcap#35514)
  *: enable exportloopref  (pingcap#35680)
  types: fix bad error message for numeric conversion issue#32744 (pingcap#34047)
  *: enable ineffassign (pingcap#35670)
  config, sysvar: map `max-server-connections` to `max_connections` (pingcap#35453)
  *: enable durationcheck for nogo linter (pingcap#35661)
  *: fix issue of cast string as time is incompatible with MySQL (pingcap#35455)
  ...
@lcwangchao lcwangchao deleted the sessionstop branch June 27, 2022 02:48
morgo added a commit to morgo/tidb that referenced this pull request Jun 28, 2022
* upstream/master: (57 commits)
  types: fix incompatible implementation of jsonpath extraction (pingcap#35320)
  planner: fix TRACE PLAN TARGET = 'estimation' panic when meeting partition table (pingcap#35743)
  *: Add `testfork.RunTest` to run multiple tests in one function (pingcap#35746)
  sessionctx/variable: add tests to ensure skipInit can be removed (pingcap#35703)
  helper: request another PD if one of them is unavailable (pingcap#35750)
  metrics: add cached table related metrics to grafana panel (pingcap#34718)
  expression: use cloned RetType at `evaluateExprWithNull` when it may be changed. (pingcap#35759)
  executor: fix left join on partition table generate invalid lock key (pingcap#35732)
  readme: remove adopters (pingcap/docs#8725) (pingcap#35124)
  *: only add default value for final aggregation to fix the aggregate push down (partition) union case (pingcap#35443)
  planner: fix the wrong cost formula of MPPExchanger on cost model ver2 (pingcap#35718)
  sessionctx: support encoding and decoding statement context (pingcap#35688)
  txn: refactor ts acquisition within build and execute phases (pingcap#35376)
  ddl: for schema-level DDL method parameter is now XXXStmt (pingcap#35722)
  *: enable gofmt (pingcap#35721)
  planner: disable collate clause support for enum or set column (pingcap#35684)
  *: Provide a util to "pause" session in uint test (pingcap#35529)
  ddl: implement the core for multi-schema change (pingcap#35429)
  parser: XXXDatabaseStmt now use CIStr for DB name (pingcap#35668)
  *: remove real tikv test on github actions (pingcap#35710)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support "pause" a session in unit test
5 participants