pkg/parser: support SWITCH_GROUP syntax for runaway watch #54804

JmPotato · 2024-07-22T09:02:30Z

What problem does this PR solve?

Issue Number: ref #54434. Should merge after pingcap/kvproto#1254.

What changed and how does it work?

Add SWITCH_GROUP(<name>) syntax for runaway watch.

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below)

By QUERY WATCH ADD:

Release note

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

None

ti-chi-bot · 2024-07-22T09:02:33Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

tiprow · 2024-07-22T09:02:42Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

JmPotato · 2024-08-07T12:49:01Z

/retest

codecov · 2024-08-07T13:09:21Z

Codecov Report

Attention: Patch coverage is 72.97297% with 30 lines in your changes missing coverage. Please review.

Project coverage is 56.7529%. Comparing base (e77d4a1) to head (bd7b88f).
Report is 1 commits behind head on master.

Additional details and impacted files

@@                Coverage Diff                @@
##             master     #54804         +/-   ##
=================================================
- Coverage   72.8344%   56.7529%   -16.0816%     
=================================================
  Files          1598       1748        +150     
  Lines        444284     627973     +183689     
=================================================
+ Hits         323592     356393      +32801     
- Misses       100778     246949     +146171     
- Partials      19914      24631       +4717

Flag	Coverage Δ
integration	`39.4583% <2.7027%> (?)`
unit	`72.0134% <72.9729%> (+0.0641%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components	Coverage Δ
dumpling	`52.9567% <ø> (ø)`
parser	`∅ <ø> (∅)`
br	`62.7858% <ø> (+16.9923%)`	⬆️

nolouch · 2024-08-22T11:39:59Z

pkg/domain/resourcegroup/runaway.go

@@ -480,38 +513,47 @@ func newRunawayChecker(
 }

 // BeforeExecutor checks whether query is in watch list before executing and after compiling.
-func (r *RunawayChecker) BeforeExecutor() error {
+func (r *RunawayChecker) BeforeExecutor() (string, error) {


How about BeforeExecutor(stmt Ctx)?

It can be, but introducing *stmtctx.StatementContext in RunawayChecker will have the circular dependency problem. Though we could use an interface like resourceGroupNameSetter to resolve this, it's also simple to just directly return the switch resource group here.

nolouch · 2024-08-26T05:13:24Z

pkg/domain/resourcegroup/runaway.go

@@ -127,6 +148,7 @@ func (r *QuarantineRecord) GenInsertionStmt() (string, []any) {
 	params = append(params, r.WatchText)
 	params = append(params, r.Source)
 	params = append(params, r.Action)
+	params = append(params, r.GetSwitchGroupName())


Does action already contain the switch group name here?

No, since r.Action of type rmpb.RunawayAction only contains the action type information, extending it in kvproto could cause backward compatibility issues. Therefore, I chose to add a new column to store the switch group name instead.

JmPotato · 2024-09-02T02:41:11Z

/cc @HuSharp @nolouch @glorv

PTAL, thx!

glorv · 2024-09-02T03:31:03Z

/retest

ti-chi-bot · 2024-09-03T08:23:23Z

[LGTM Timeline notifier]

Timeline:

2024-09-03 06:41:26.034246855 +0000 UTC m=+340210.552299781: ☑️ agreed by nolouch.
2024-09-03 08:23:22.567014551 +0000 UTC m=+346327.085067476: ☑️ agreed by glorv.

pkg/session/bootstrap.go

D3Hunter · 2024-09-04T03:39:55Z

/approve

for ddl/parser pkg

HuSharp · 2024-09-04T06:51:32Z

/retest-required

GMHDBJD

LGTM

yudongusa

LGTM

ti-chi-bot · 2024-09-04T14:38:17Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: D3Hunter, glorv, GMHDBJD, HuSharp, lcwangchao, nolouch, yudongusa, YuJuncen

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [D3Hunter,GMHDBJD,YuJuncen,glorv,lcwangchao]
~~br/OWNERS~~ [YuJuncen]
~~pkg/ddl/OWNERS~~ [D3Hunter,GMHDBJD]
~~pkg/meta/OWNERS~~ [GMHDBJD]
~~pkg/parser/OWNERS~~ [D3Hunter,yudongusa]
~~pkg/session/OWNERS~~ [yudongusa]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Signed-off-by: JmPotato <[email protected]>

tiprow · 2024-09-04T15:55:19Z

@JmPotato: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
fast_test_tiprow	`bd7b88f`	link	true	`/test fast_test_tiprow`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

JmPotato · 2024-09-04T16:15:01Z

/test unit-test

tiprow · 2024-09-04T16:15:07Z

@JmPotato: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test fast_test_tiprow
/test tidb_parser_test

Use /test all to run all jobs.

In response to this:

/test unit-test

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

JmPotato · 2024-09-04T16:33:34Z

/test unit-test

tiprow · 2024-09-04T16:33:40Z

@JmPotato: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test fast_test_tiprow
/test tidb_parser_test

Use /test all to run all jobs.

In response to this:

/test unit-test

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

ti-chi-bot bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 22, 2024

ti-chi-bot bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 25, 2024

JmPotato force-pushed the switch_group_runaway branch from ce699f9 to 41d76c3 Compare July 25, 2024 06:47

ti-chi-bot bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 25, 2024

JmPotato force-pushed the switch_group_runaway branch from 41d76c3 to 4ac322e Compare July 25, 2024 07:36

ti-chi-bot bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 26, 2024

JmPotato force-pushed the switch_group_runaway branch 2 times, most recently from cf16f00 to fc94505 Compare August 2, 2024 06:45

JmPotato force-pushed the switch_group_runaway branch 3 times, most recently from 5925721 to 8a7ba0a Compare August 7, 2024 12:35

JmPotato marked this pull request as ready for review August 7, 2024 12:35

ti-chi-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 7, 2024

JmPotato force-pushed the switch_group_runaway branch from 8a7ba0a to 19d07b9 Compare August 7, 2024 13:09

JmPotato force-pushed the switch_group_runaway branch from 19d07b9 to 028d340 Compare August 8, 2024 10:38

JmPotato force-pushed the switch_group_runaway branch from 028d340 to ce75fa0 Compare August 19, 2024 04:04

ti-chi-bot bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 19, 2024

JmPotato force-pushed the switch_group_runaway branch from 319c7b1 to dca85a4 Compare August 19, 2024 05:42

nolouch reviewed Aug 22, 2024

View reviewed changes

nolouch reviewed Aug 26, 2024

View reviewed changes

JmPotato force-pushed the switch_group_runaway branch from dca85a4 to f80cfb6 Compare September 2, 2024 02:39

JmPotato requested a review from nolouch September 2, 2024 02:40

JmPotato force-pushed the switch_group_runaway branch from 3439414 to 1ccc6b1 Compare September 4, 2024 03:26

D3Hunter reviewed Sep 4, 2024

View reviewed changes

pkg/session/bootstrap.go Outdated Show resolved Hide resolved

JmPotato force-pushed the switch_group_runaway branch 3 times, most recently from 1aca797 to 0fb089e Compare September 4, 2024 05:56

YuJuncen approved these changes Sep 4, 2024

View reviewed changes

GMHDBJD approved these changes Sep 4, 2024

View reviewed changes

lcwangchao approved these changes Sep 4, 2024

View reviewed changes

yudongusa approved these changes Sep 4, 2024

View reviewed changes

ti-chi-bot bot added the approved label Sep 4, 2024

JmPotato added 6 commits September 4, 2024 23:39

Implement SWITCH_GROUP syntax for runaway watch

c1c146a

Signed-off-by: JmPotato <[email protected]>

Switch group in BeforeCopRequest

7cdc21a

Signed-off-by: JmPotato <[email protected]>

Update to the latest kvproto

04d5196

Signed-off-by: JmPotato <[email protected]>

Fix the typo

11e24b8

Signed-off-by: JmPotato <[email protected]>

Update the latest kvproto to fix panic

b4b46e2

Signed-off-by: JmPotato <[email protected]>

Merge the upstream changes

bd7b88f

Signed-off-by: JmPotato <[email protected]>

JmPotato force-pushed the switch_group_runaway branch from 0fb089e to bd7b88f Compare September 4, 2024 15:40

ti-chi-bot bot merged commit c9baef4 into pingcap:master Sep 4, 2024
24 of 25 checks passed

JmPotato deleted the switch_group_runaway branch September 4, 2024 17:01

JmPotato mentioned this pull request Sep 18, 2024

Add new resource control action SWITCH_GROUP pingcap/docs#18926

Merged

2 tasks

nolouch mentioned this pull request Sep 26, 2024

Enhance runaway query management features #54434

Closed

10 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

pkg/parser: support SWITCH_GROUP syntax for runaway watch #54804

pkg/parser: support SWITCH_GROUP syntax for runaway watch #54804

JmPotato commented Jul 22, 2024 •

edited

Loading

ti-chi-bot bot commented Jul 22, 2024

tiprow bot commented Jul 22, 2024

JmPotato commented Aug 7, 2024

codecov bot commented Aug 7, 2024 •

edited

Loading

nolouch Aug 22, 2024

JmPotato Aug 26, 2024

nolouch Aug 26, 2024

JmPotato Aug 26, 2024

JmPotato commented Sep 2, 2024 •

edited

Loading

glorv commented Sep 2, 2024

ti-chi-bot bot commented Sep 3, 2024

D3Hunter commented Sep 4, 2024

HuSharp commented Sep 4, 2024

GMHDBJD left a comment

yudongusa left a comment

ti-chi-bot bot commented Sep 4, 2024

tiprow bot commented Sep 4, 2024

JmPotato commented Sep 4, 2024

tiprow bot commented Sep 4, 2024

JmPotato commented Sep 4, 2024

tiprow bot commented Sep 4, 2024

pkg/parser: support SWITCH_GROUP syntax for runaway watch #54804

pkg/parser: support SWITCH_GROUP syntax for runaway watch #54804

Conversation

JmPotato commented Jul 22, 2024 • edited Loading

What problem does this PR solve?

What changed and how does it work?

Check List

Release note

ti-chi-bot bot commented Jul 22, 2024

tiprow bot commented Jul 22, 2024

JmPotato commented Aug 7, 2024

codecov bot commented Aug 7, 2024 • edited Loading

Codecov Report

nolouch Aug 22, 2024

Choose a reason for hiding this comment

JmPotato Aug 26, 2024

Choose a reason for hiding this comment

nolouch Aug 26, 2024

Choose a reason for hiding this comment

JmPotato Aug 26, 2024

Choose a reason for hiding this comment

JmPotato commented Sep 2, 2024 • edited Loading

glorv commented Sep 2, 2024

ti-chi-bot bot commented Sep 3, 2024

[LGTM Timeline notifier]

D3Hunter commented Sep 4, 2024

HuSharp commented Sep 4, 2024

GMHDBJD left a comment

Choose a reason for hiding this comment

yudongusa left a comment

Choose a reason for hiding this comment

ti-chi-bot bot commented Sep 4, 2024

tiprow bot commented Sep 4, 2024

JmPotato commented Sep 4, 2024

tiprow bot commented Sep 4, 2024

JmPotato commented Sep 4, 2024

tiprow bot commented Sep 4, 2024

JmPotato commented Jul 22, 2024 •

edited

Loading

codecov bot commented Aug 7, 2024 •

edited

Loading

JmPotato commented Sep 2, 2024 •

edited

Loading