runaway: change `tidb_runaway_watch` time type to UTC (#54768) #54835

ti-chi-bot · 2024-07-23T08:06:02Z

This is an automated cherry-pick of #54768

What problem does this PR solve?

Issue Number: Close #54770, Ref #54434

Problem Summary: runaway: change tidb_runaway_watch to UTC

What changed and how does it work?

Currently tidb_runaway_watch relies on struct QuarantineRecord to store time as UTC, while runaway_watch directly selects tidb_runaway_watch to convert to local time. Let's change tidb_runaway_watch to UTC as well.

why not change tidb_runaway_watch to local time?
because tidb_runaway_watch is datetime, which is different from timestamp, and can not convert UTC to local time automatically.

tidb/pkg/session/bootstrap.go

Lines 635 to 646 in e5a8a23

CreateRunawayWatchTable = `CREATE TABLE IF NOT EXISTS mysql.tidb_runaway_watch (

id BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,

resource_group_name varchar(32) not null,

start_time datetime(6) NOT NULL,

end_time datetime(6),

watch bigint(10) NOT NULL,

watch_text TEXT NOT NULL,

source varchar(512) NOT NULL,

action bigint(10),

INDEX sql_index(resource_group_name,watch_text(700)) COMMENT "accelerate the speed when select quarantined query",

INDEX time_index(end_time) COMMENT "accelerate the speed when querying with active watch"

) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;`

This means the timezone information will be lost, and the user will not know which timezone to switch to when in crossing time zones (the user needs to confirm the local time zone on the server side).

before

mysql> SELECT * FROM mysql.tidb_runaway_watch limit 1\G
*************************** 1. row ***************************
                 id: 1
resource_group_name: default
         start_time: 2024-07-16 07:34:14.137009
           end_time: 2024-07-16 07:44:14.137009
              watch: 1
         watch_text: select  count(*) from orders where o_orderdate = '1994-11-12'
             source: 127.0.0.1:4000
             action: 3
1 row in set (0.00 sec)

mysql> SELECT * FROM INFORMATION_SCHEMA.RUNAWAY_WATCHES where id =1\G
*************************** 1. row ***************************
                 ID: 1
RESOURCE_GROUP_NAME: default
         START_TIME: 2024-07-16 15:34:14
           END_TIME: 2024-07-16 15:44:14
              WATCH: Exact
         WATCH_TEXT: select  count(*) from orders where o_orderdate = '1994-11-12'
             SOURCE: 127.0.0.1:4000
             ACTION: Kill
1 row in set (0.01 sec)

After

mysql> SELECT * FROM mysql.tidb_runaway_watch limit 1\G
*************************** 1. row ***************************
                 id: 1
resource_group_name: default
         start_time: 2024-07-19 07:18:36.572748
           end_time: 2024-07-19 07:28:36.572748
              watch: 1
         watch_text: select  count(*) from orders where o_orderdate = '1992-07-03'
             source: 127.0.0.1:4000
             action: 3
1 row in set (0.00 sec)

mysql> SELECT * FROM INFORMATION_SCHEMA.RUNAWAY_WATCHES where id =1\G
*************************** 1. row ***************************
                 ID: 1
RESOURCE_GROUP_NAME: default
         START_TIME: 2024-07-19 07:18:36
           END_TIME: 2024-07-19 07:28:36
              WATCH: Exact
         WATCH_TEXT: select  count(*) from orders where o_orderdate = '1992-07-03'
             SOURCE: 127.0.0.1:4000
             ACTION: Kill
1 row in set (0.00 sec)

Check List

Tests

Integration test
Manual test (add detailed scripts or steps below)
No need to test
- I checked and no code files have been changed.

Release note

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

runaway: change tidb_runaway_watch time type to UTC

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

codecov · 2024-07-23T09:21:22Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (release-8.1@42b624c). Learn more about missing BASE report.

Additional details and impacted files

@@               Coverage Diff                @@
##             release-8.1     #54835   +/-   ##
================================================
  Coverage               ?   72.5207%           
================================================
  Files                  ?       1466           
  Lines                  ?     435037           
  Branches               ?          0           
================================================
  Hits                   ?     315492           
  Misses                 ?      99106           
  Partials               ?      20439

Flag	Coverage Δ
unit	`72.5207% <100.0000%> (?)`

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

Components	Coverage Δ
dumpling	`57.8032% <0.0000%> (?)`
parser	`∅ <0.0000%> (?)`
br	`41.0574% <0.0000%> (?)`

HuSharp · 2024-07-25T04:57:02Z

/retest-required

GMHDBJD

LGTM

ti-chi-bot · 2024-08-05T03:05:18Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: GMHDBJD, JmPotato

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~~ [GMHDBJD]
~~pkg/domain/OWNERS~~ [GMHDBJD]

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

ti-chi-bot · 2024-08-05T03:05:22Z

[LGTM Timeline notifier]

Timeline:

2024-07-25 06:49:34.210816177 +0000 UTC m=+1114196.201757647: ☑️ agreed by JmPotato.
2024-08-05 03:05:21.867271529 +0000 UTC m=+234851.734370617: ☑️ agreed by GMHDBJD.

HuSharp · 2024-08-05T04:40:06Z

/test mysql-test

tiprow · 2024-08-05T04:40:21Z

@HuSharp: No presubmit jobs available for pingcap/[email protected]

In response to this:

/test mysql-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.

HuSharp · 2024-08-05T04:46:21Z

/test mysql-test

tiprow · 2024-08-05T04:46:35Z

@HuSharp: No presubmit jobs available for pingcap/[email protected]

In response to this:

/test mysql-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.

HuSharp · 2024-08-05T05:11:31Z

/test mysql-test

tiprow · 2024-08-05T05:11:46Z

@HuSharp: No presubmit jobs available for pingcap/[email protected]

In response to this:

/test mysql-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.

HuSharp · 2024-08-05T05:38:09Z

/test mysql-test

tiprow · 2024-08-05T05:38:27Z

@HuSharp: No presubmit jobs available for pingcap/[email protected]

In response to this:

/test mysql-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.

HuSharp · 2024-08-05T06:34:12Z

/test check-dev2

tiprow · 2024-08-05T06:34:29Z

@HuSharp: No presubmit jobs available for pingcap/[email protected]

In response to this:

/test check-dev2

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.

HuSharp · 2024-08-05T07:31:01Z

/test check-dev2

tiprow · 2024-08-05T07:31:16Z

@HuSharp: No presubmit jobs available for pingcap/[email protected]

In response to this:

/test check-dev2

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 mentioned this pull request Jul 23, 2024

runaway: change RUNAWAY_WATCHES time type to UTC #54768

Merged

4 tasks

ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/cherry-pick-for-release-8.1 This PR is cherry-picked to release-8.1 from a source PR. labels Jul 23, 2024

ti-chi-bot assigned HuSharp Jul 23, 2024

ti-chi-bot bot added do-not-merge/cherry-pick-not-approved size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 23, 2024

fix conflict

fb93b23

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

HuSharp force-pushed the cherry-pick-54768-to-release-8.1 branch from 1a88cde to fb93b23 Compare July 23, 2024 08:42

ti-chi-bot bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 23, 2024

JmPotato approved these changes Jul 25, 2024

View reviewed changes

ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Jul 25, 2024

ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jul 31, 2024

ti-chi-bot bot removed the do-not-merge/cherry-pick-not-approved label Jul 31, 2024

GMHDBJD approved these changes Aug 5, 2024

View reviewed changes

ti-chi-bot bot added approved lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Aug 5, 2024

ti-chi-bot bot merged commit abee658 into pingcap:release-8.1 Aug 5, 2024
18 checks passed

HuSharp deleted the cherry-pick-54768-to-release-8.1 branch August 5, 2024 12:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

runaway: change `tidb_runaway_watch` time type to UTC (#54768) #54835

runaway: change `tidb_runaway_watch` time type to UTC (#54768) #54835

ti-chi-bot commented Jul 23, 2024

codecov bot commented Jul 23, 2024 •

edited

Loading

HuSharp commented Jul 25, 2024

GMHDBJD left a comment

ti-chi-bot bot commented Aug 5, 2024

ti-chi-bot bot commented Aug 5, 2024

HuSharp commented Aug 5, 2024

tiprow bot commented Aug 5, 2024

HuSharp commented Aug 5, 2024

tiprow bot commented Aug 5, 2024

HuSharp commented Aug 5, 2024

tiprow bot commented Aug 5, 2024

HuSharp commented Aug 5, 2024

tiprow bot commented Aug 5, 2024

HuSharp commented Aug 5, 2024

tiprow bot commented Aug 5, 2024

HuSharp commented Aug 5, 2024

tiprow bot commented Aug 5, 2024

	CreateRunawayWatchTable = `CREATE TABLE IF NOT EXISTS mysql.tidb_runaway_watch (
	id BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
	resource_group_name varchar(32) not null,
	start_time datetime(6) NOT NULL,
	end_time datetime(6),
	watch bigint(10) NOT NULL,
	watch_text TEXT NOT NULL,
	source varchar(512) NOT NULL,
	action bigint(10),
	INDEX sql_index(resource_group_name,watch_text(700)) COMMENT "accelerate the speed when select quarantined query",
	INDEX time_index(end_time) COMMENT "accelerate the speed when querying with active watch"
	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;`

runaway: change tidb_runaway_watch time type to UTC (#54768) #54835

runaway: change tidb_runaway_watch time type to UTC (#54768) #54835

Conversation

ti-chi-bot commented Jul 23, 2024

What problem does this PR solve?

What changed and how does it work?

Check List

Release note

codecov bot commented Jul 23, 2024 • edited Loading

Codecov Report

HuSharp commented Jul 25, 2024

GMHDBJD left a comment

Choose a reason for hiding this comment

ti-chi-bot bot commented Aug 5, 2024

ti-chi-bot bot commented Aug 5, 2024

[LGTM Timeline notifier]

HuSharp commented Aug 5, 2024

tiprow bot commented Aug 5, 2024

HuSharp commented Aug 5, 2024

tiprow bot commented Aug 5, 2024

HuSharp commented Aug 5, 2024

tiprow bot commented Aug 5, 2024

HuSharp commented Aug 5, 2024

tiprow bot commented Aug 5, 2024

HuSharp commented Aug 5, 2024

tiprow bot commented Aug 5, 2024

HuSharp commented Aug 5, 2024

tiprow bot commented Aug 5, 2024

runaway: change `tidb_runaway_watch` time type to UTC (#54768) #54835

runaway: change `tidb_runaway_watch` time type to UTC (#54768) #54835

codecov bot commented Jul 23, 2024 •

edited

Loading