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

ttl: fix the timezone issue and panic in the caller of getSession (#58166) #58709

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #58166

What problem does this PR solve?

Issue Number: close #58107, close #58109

It fixes two issues:

  1. The caller of getSession() may panic, because the getSession() may return nil, nil.
  2. The timezone of the now in rescheduleJobs is incorrect.

What changed and how does it work?

  1. Remove the nowInGlobalTZ in rescheduleJobs. It's introduced in https://github.com/pingcap/tidb/pull/51863/files#diff-9053b8d1ea0965da6e623343fd8fa0706cf9fc01a327e70a00aa7d7ae376177eR568, but I don't know why. It seems that the timeutil.WithinDayTimePeriod will set location to UTC instantly.
  2. Replace a err = to err := in getSession()

Check List

Tests

  • Unit test
  • 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

None

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR. labels Jan 6, 2025
@ti-chi-bot ti-chi-bot bot added do-not-merge/cherry-pick-not-approved size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 6, 2025
Signed-off-by: Yang Keao <yangkeao@chunibyo.icu>
@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 6, 2025
@YangKeao
Copy link
Member

YangKeao commented Jan 6, 2025

/retest

Copy link

codecov bot commented Jan 6, 2025

Codecov Report

Attention: Patch coverage is 50.00000% with 1 line in your changes missing coverage. Please review.

Please upload report for BASE (release-8.5@4468f56). Learn more about missing BASE report.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-8.5     #58709   +/-   ##
================================================
  Coverage               ?   57.0199%           
================================================
  Files                  ?       1770           
  Lines                  ?     627244           
  Branches               ?          0           
================================================
  Hits                   ?     357654           
  Misses                 ?     245423           
  Partials               ?      24167           
Flag Coverage Δ
integration 36.8777% <50.0000%> (?)
unit 72.7047% <50.0000%> (?)

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

Components Coverage Δ
dumpling 52.8711% <0.0000%> (?)
parser ∅ <0.0000%> (?)
br 52.2712% <0.0000%> (?)

@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jan 6, 2025
Copy link
Member

@YangKeao YangKeao left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jan 7, 2025
Copy link

ti-chi-bot bot commented Jan 7, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-01-06 09:28:32.151565969 +0000 UTC m=+173055.440397674: ☑️ agreed by lcwangchao.
  • 2025-01-07 06:02:59.939229063 +0000 UTC m=+247123.228060768: ☑️ agreed by YangKeao.

@lcwangchao
Copy link
Collaborator

/merge

Copy link

ti-chi-bot bot commented Jan 7, 2025

@lcwangchao: We have migrated to builtin LGTM and approve plugins for reviewing.

👉 Please use /approve when you want approve this pull request.

The changes announcement: LGTM plugin changes

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 ti-community-infra/tichi repository.

@lcwangchao
Copy link
Collaborator

/approve

Copy link

ti-chi-bot bot commented Jan 7, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lcwangchao, YangKeao

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 [YangKeao,lcwangchao]

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

…58166-to-release-8.5

Signed-off-by: Yang Keao <yangkeao@chunibyo.icu>
Signed-off-by: Yang Keao <yangkeao@chunibyo.icu>
@ti-chi-bot ti-chi-bot bot merged commit d9c7e43 into pingcap:release-8.5 Jan 7, 2025
18 checks passed
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/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants