Skip to content

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #56015

What problem does this PR solve?

before

When using QUERY WATCH ADD RESOURCE GROUP default SQL TEXT EXACT TO 'select * from sbtest.sbtest1'; will add local time

mysql> SELECT * FROM INFORMATION_SCHEMA.RUNAWAY_WATCHES ORDER BY id\G
*************************** 1. row ***************************
                 ID: 1
RESOURCE_GROUP_NAME: default
         START_TIME: 2024-09-11 07:38:09
           END_TIME: 2024-09-11 07:48:09
              WATCH: Exact
         WATCH_TEXT: select sleep(2) from t
             SOURCE: 127.0.0.1:4000
             ACTION: Kill
*************************** 2. row ***************************
                 ID: 2
RESOURCE_GROUP_NAME: default
         START_TIME: 2024-09-11 15:38:20
           END_TIME: UNLIMITED
              WATCH: Exact
         WATCH_TEXT: select * from sbtest.sbtest1
             SOURCE: manual
             ACTION: Kill
2 rows in set (0.00 sec)

After

mysql> SELECT * FROM INFORMATION_SCHEMA.RUNAWAY_WATCHES ORDER BY id\G
*************************** 1. row ***************************
                 ID: 1
RESOURCE_GROUP_NAME: default
         START_TIME: 2024-09-11 07:41:55
           END_TIME: 2024-09-11 07:51:55
              WATCH: Exact
         WATCH_TEXT: select sleep(2) from t
             SOURCE: 127.0.0.1:4000
             ACTION: Kill
*************************** 2. row ***************************
                 ID: 2
RESOURCE_GROUP_NAME: default
         START_TIME: 2024-09-11 07:42:02
           END_TIME: UNLIMITED
              WATCH: Exact
         WATCH_TEXT: select * from sbtest.sbtest1
             SOURCE: manual
             ACTION: Kill

Issue Number: close #54770

Problem Summary:

What changed and how does it work?

Check List

Tests

  • Manual test (add detailed scripts or steps below)
    • 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.

None

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR. labels Sep 12, 2024
@HuSharp
Copy link
Contributor

HuSharp commented Sep 12, 2024

@nolouch @glorv PTAL, thx~

Signed-off-by: husharp <[email protected]>
@HuSharp HuSharp force-pushed the cherry-pick-56015-to-release-7.5 branch from 2748a5d to 07ff6b3 Compare September 12, 2024 08:30
@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Sep 12, 2024
@HuSharp
Copy link
Contributor

HuSharp commented Sep 23, 2024

@nolouch @JmPotato PTAL, thx~

Copy link

ti-chi-bot bot commented Sep 23, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: glorv, 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:

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 ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Sep 23, 2024
Copy link

ti-chi-bot bot commented Sep 23, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-09-12 08:36:24.798598967 +0000 UTC m=+518254.539022907: ☑️ agreed by glorv.
  • 2024-09-23 12:08:46.749440577 +0000 UTC m=+1481396.489864525: ☑️ agreed by JmPotato.

Copy link

codecov bot commented Sep 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (release-7.5@5665343). Learn more about missing BASE report.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-7.5     #56042   +/-   ##
================================================
  Coverage               ?   72.5073%           
================================================
  Files                  ?       1413           
  Lines                  ?     415053           
  Branches               ?          0           
================================================
  Hits                   ?     300944           
  Misses                 ?      94365           
  Partials               ?      19744           
Flag Coverage Δ
unit 72.5073% <100.0000%> (?)

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

Components Coverage Δ
dumpling 52.9400% <0.0000%> (?)
parser ∅ <0.0000%> (?)
br 53.5592% <0.0000%> (?)

@HuSharp
Copy link
Contributor

HuSharp commented Sep 23, 2024

/retest-required

@ti-chi-bot ti-chi-bot bot merged commit 9d71779 into pingcap:release-7.5 Sep 23, 2024
18 checks passed
@HuSharp HuSharp deleted the cherry-pick-56015-to-release-7.5 branch September 23, 2024 13:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants