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

pkg/pdutil(ticdc): improve pd time accuracy #7024

Merged
merged 7 commits into from
Sep 12, 2022

Conversation

overvenus
Copy link
Member

What problem does this PR solve?

Issue Number: ref #4757

What is changed and how it works?

Add duration to ts event time.

Check List

Tests

  • Unit test

Questions

Will it cause performance regression or break compatibility?

No.

Do you need to update user documentation, design documentation or monitoring documentation?

No.

Release note

None

Signed-off-by: Neil Shen <overvenus@gmail.com>
@overvenus overvenus added the area/ticdc Issues or PRs related to TiCDC. label Sep 8, 2022
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 8, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3AceShowHand
  • asddongmen

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 release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 8, 2022
@asddongmen
Copy link
Contributor

please fix the failed test cases.

pkg/pdutil/clock.go Outdated Show resolved Hide resolved
pkg/pdutil/clock.go Outdated Show resolved Hide resolved
return cacheTime, errors.Trace(err)
defer c.mu.RUnlock()
tsEventTime := c.mu.tsEventTime
current := tsEventTime.Add(time.Since(c.mu.tsProcessingTime))
Copy link
Contributor

Choose a reason for hiding this comment

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

why can we just return tsEventTime.Add(time.Since(c.mu.tsProcessingTime))?

Copy link
Member Author

Choose a reason for hiding this comment

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

To make code easier to understand

Signed-off-by: Neil Shen <overvenus@gmail.com>
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 9, 2022
@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 Sep 9, 2022
@asddongmen
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: d8c4c61

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 9, 2022
@ti-chi-bot
Copy link
Member

@overvenus: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

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.

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.

return ret, nil
}

// Run will get time from pd periodically to cache in timeCache
// Run gets time from pd periodically.
func (c *clock) Run(ctx context.Context) {
ctx, cancel := context.WithCancel(ctx)
c.cancel = cancel
Copy link
Contributor

Choose a reason for hiding this comment

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

cancel is called by stop, cause race detected in the test.

Signed-off-by: Neil Shen <overvenus@gmail.com>
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Sep 12, 2022
@overvenus
Copy link
Member Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 159c546

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 12, 2022
@codecov-commenter
Copy link

codecov-commenter commented Sep 12, 2022

Codecov Report

Merging #7024 (159c546) into master (9398176) will increase coverage by 0.0447%.
The diff coverage is 60.9970%.

Additional details and impacted files
Flag Coverage Δ
cdc 67.2318% <62.4481%> (+0.0359%) ⬆️
dm 51.9208% <50.0000%> (-0.0271%) ⬇️
engine 62.4248% <60.1547%> (+0.1626%) ⬆️

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

@@               Coverage Diff                @@
##             master      #7024        +/-   ##
================================================
+ Coverage   59.8253%   59.8700%   +0.0447%     
================================================
  Files           791        792         +1     
  Lines         90221      90648       +427     
================================================
+ Hits          53975      54271       +296     
- Misses        31498      31616       +118     
- Partials       4748       4761        +13     

@3AceShowHand
Copy link
Contributor

/run-all-tests

}

// Stop clock.
func (c *clock) Stop() {
c.mu.Lock()
defer c.mu.Unlock()
c.cancel()
Copy link
Contributor

Choose a reason for hiding this comment

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

it looks that the cancel maybe nil?

@3AceShowHand
Copy link
Contributor

/run-verify-ci

@ti-chi-bot ti-chi-bot merged commit 52a78bd into pingcap:master Sep 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/ticdc Issues or PRs related to TiCDC. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants