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

disttask: refine manager retry #51071

Merged
merged 4 commits into from
Feb 26, 2024
Merged

Conversation

ywqzzy
Copy link
Contributor

@ywqzzy ywqzzy commented Feb 8, 2024

What problem does this PR solve?

Issue Number: ref #49008

Problem Summary:

What changed and how does it work?

Use handle.RunWithRetry

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.

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@ti-chi-bot ti-chi-bot bot added do-not-merge/needs-linked-issue do-not-merge/needs-tests-checked 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 Feb 8, 2024
Copy link

tiprow bot commented Feb 8, 2024

Hi @ywqzzy. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

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 kubernetes/test-infra repository.

Copy link

codecov bot commented Feb 8, 2024

Codecov Report

Merging #51071 (d943d2c) into master (f0a26dd) will decrease coverage by 15.4425%.
Report is 96 commits behind head on master.
The diff coverage is 100.0000%.

Additional details and impacted files
@@                Coverage Diff                @@
##             master     #51071         +/-   ##
=================================================
- Coverage   70.5842%   55.1418%   -15.4425%     
=================================================
  Files          1467       1583        +116     
  Lines        434825     629323     +194498     
=================================================
+ Hits         306918     347020      +40102     
- Misses       108672     258210     +149538     
- Partials      19235      24093       +4858     
Flag Coverage Δ
integration 37.1942% <33.3333%> (?)
unit 70.3229% <90.4761%> (-0.0742%) ⬇️

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

Components Coverage Δ
dumpling 54.2644% <ø> (-0.0297%) ⬇️
parser ∅ <ø> (∅)
br 49.7539% <ø> (+4.0087%) ⬆️

}

func (m *Manager) runWithRetry(fn func() error, msg string) error {
backoffer := backoff.NewExponential(scheduler.RetrySQLInterval, 2, scheduler.RetrySQLMaxInterval)
Copy link
Contributor

Choose a reason for hiding this comment

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

Why do we not put this to RunWithRetry? Then we can use it directly.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

maybe too many params?

if err1 != nil {
m.logger.Error("update to subtask failed", zap.Error(err1), zap.Stack("stack"))
m.logger.Warn(msg, zap.Error(err1))
Copy link
Contributor

Choose a reason for hiding this comment

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

It seems that the error log is printed in RunWithRetry, so could we remove this log?

Copy link
Contributor Author

@ywqzzy ywqzzy Feb 23, 2024

Choose a reason for hiding this comment

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

I prefer to add some log to indicate where it happens

@ywqzzy
Copy link
Contributor Author

ywqzzy commented Feb 23, 2024

/retest

Copy link

tiprow bot commented Feb 23, 2024

@ywqzzy: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

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 kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Feb 23, 2024
Copy link

ti-chi-bot bot commented Feb 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: D3Hunter, okJiang

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 Feb 26, 2024
Copy link

ti-chi-bot bot commented Feb 26, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-02-23 07:44:40.92556931 +0000 UTC m=+602369.673192422: ☑️ agreed by D3Hunter.
  • 2024-02-26 10:18:56.896411415 +0000 UTC m=+870825.644034526: ☑️ agreed by okJiang.

@ti-chi-bot ti-chi-bot bot merged commit f35778f into pingcap:master Feb 26, 2024
21 of 23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants