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

Avoid duration calculation panic when clock jumps back (#10544) #10571

Merged
merged 5 commits into from
Sep 1, 2021
Merged

Avoid duration calculation panic when clock jumps back (#10544) #10571

merged 5 commits into from
Sep 1, 2021

Conversation

tabokie
Copy link
Member

@tabokie tabokie commented Jul 14, 2021

Cherry-pick #10544

Release note 

Fix duration calculation panics on certain platforms

@tabokie
Avoid duration calculation panic when clock jumps back (tikv#10544)
e05e2e1 
* calculate duration with no panic

Signed-off-by: tabokie <xy.tao@outlook.com>

* fix tests crate build

Signed-off-by: tabokie <xy.tao@outlook.com>

* use extension trait and rm some obsolete files

Signed-off-by: tabokie <xy.tao@outlook.com>

* deprecate custom functions and use better logging

Signed-off-by: tabokie <xy.tao@outlook.com>

* fix uses of elapsed_secs

Signed-off-by: tabokie <xy.tao@outlook.com>
@ti-chi-bot ti-chi-bot added do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 14, 2021
@tabokie
fix build
8460748 
Signed-off-by: tabokie <xy.tao@outlook.com>
@tabokie tabokie added the type/cherry-pick Type: PR - Cherry pick label Jul 14, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 14, 2021
@tabokie tabokie modified the milestones: v5.0.4, v5.0.3 Jul 15, 2021
@tabokie
address comments
76dc13b 
Signed-off-by: tabokie <xy.tao@outlook.com>
Connor1996
Connor1996 approved these changes Jul 20, 2021
View reviewed changes
Copy link
Member

@Connor1996 Connor1996 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
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Connor1996
  • yiwu-arbug

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 20, 2021
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 13, 2021
@ti-chi-bot ti-chi-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Aug 13, 2021
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 18, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Aug 30, 2021
@tabokie
Copy link
Member Author

tabokie commented Sep 1, 2021

/merge

@ti-chi-bot
Copy link
Member

@tabokie: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

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.

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 489bd33

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 1, 2021
@ti-chi-bot ti-chi-bot merged commit bfe70e5 into tikv:release-5.0 Sep 1, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v5.0.3, v5.0.4 Sep 10, 2021
This was referenced Sep 15, 2021
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Connor1996 Connor1996 Connor1996 approved these changes

@yiwu-arbug yiwu-arbug yiwu-arbug approved these changes

Assignees
No one assigned
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick Type: PR - Cherry pick
Projects
None yet
Milestone
v5.0.4
Development

Successfully merging this pull request may close these issues.
5 participants
@tabokie @ti-chi-bot @yiwu-arbug @Connor1996 @zhouqiang-cl