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.

Sign up for GitHub

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

Jump to bottom

Cherry pick bugfix #1054 & #1484 to tidb-7.5 branch #1515

Merged
merged 3 commits into from
Dec 12, 2024
Merged

Cherry pick bugfix #1054 & #1484 to tidb-7.5 branch #1515

merged 3 commits into from
Dec 12, 2024

Conversation

MyonKeminta
Copy link
Contributor

@MyonKeminta MyonKeminta commented Dec 10, 2024 •
edited
Loading

Cherry picks following PRs to tidb-7.5 branch:

you06 and others added 2 commits December 10, 2024 13:57
@you06 @MyonKeminta
tso: merge lastTS and lastArrivalTS into an atomic pointer (tikv#1054)
9a7c25a 
* fix the issue that stale timestamp may be a future one

Signed-off-by: you06 <you1474600@gmail.com>

* add regression test

Signed-off-by: you06 <you1474600@gmail.com>

* lazy init lastTSO

Signed-off-by: you06 <you1474600@gmail.com>

* fix panic

Signed-off-by: you06 <you1474600@gmail.com>

* address comment

Signed-off-by: you06 <you1474600@gmail.com>

---------

Signed-off-by: you06 <you1474600@gmail.com>
@MyonKeminta
Support adaptive update interval for low resolution ts (tikv#1484) (t…
3c490da 
…ikv#1491)

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
@ti-chi-bot ti-chi-bot bot added dco-signoff: yes Indicates the PR's author has signed the dco. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 10, 2024
@MyonKeminta
Fix the problem that adaptive update interval doesn't recovers back a…
72f4990 
…nd there's too much logs about setting the config (tikv#1502) (tikv#1504)

 

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Dec 12, 2024
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 12, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cfzjywxk, zyguan

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 Dec 12, 2024
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 12, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-12-12 02:48:02.872682077 +0000 UTC m=+493072.961484606: ☑️ agreed by cfzjywxk.
  • 2024-12-12 02:49:16.418262067 +0000 UTC m=+493146.507064611: ☑️ agreed by zyguan.

@ti-chi-bot ti-chi-bot bot merged commit 0dc4129 into tikv:tidb-7.5 Dec 12, 2024
11 checks passed
@MyonKeminta MyonKeminta deleted the m/cherrypick-1484-to-7.5 branch December 12, 2024 07:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cfzjywxk cfzjywxk cfzjywxk approved these changes

@zyguan zyguan zyguan approved these changes

Assignees
No one assigned
Labels
approved dco-signoff: yes Indicates the PR's author has signed the dco. lgtm size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@MyonKeminta @cfzjywxk @zyguan @you06