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

fix finalizers outdated bug on two phase conflict #2430

Merged

Conversation

Hexilee
Copy link
Member

@Hexilee Hexilee commented Oct 29, 2021

Signed-off-by: xixi i@hexilee.me

What problem does this PR solve?

Problem Summary:

In current release-1.2 branch, finalizers won't be updated on conflict.

What is changed and how it works?

What's Changed:

Update finalizers in RetryOnConflict.

Related changes

Checklist

Tests

  • Unit test
  • E2E test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Breaking backward compatibility

Release note

Please add a release note.
If you don't think this PR needs a release note then fill it with None.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Oct 29, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • YangKeao
  • cwen0

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.

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

@YangKeao
Copy link
Member

/run-e2e-tests

Copy link
Member

@cwen0 cwen0 left a comment

Choose a reason for hiding this comment

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

LGTM

@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (release-1.2@610bf30). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@              Coverage Diff               @@
##             release-1.2    #2430   +/-   ##
==============================================
  Coverage               ?   50.84%           
==============================================
  Files                  ?       86           
  Lines                  ?     6363           
  Branches               ?        0           
==============================================
  Hits                   ?     3235           
  Misses                 ?     2832           
  Partials               ?      296           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 610bf30...88d4a3a. Read the comment docs.

@Hexilee
Copy link
Member Author

Hexilee commented Oct 29, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 88d4a3a

@ti-chi-bot ti-chi-bot merged commit 097005a into chaos-mesh:release-1.2 Oct 29, 2021
Signed-off-by: xixi <i@hexilee.me>
Signed-off-by: xixi <i@hexilee.me>
Signed-off-by: xixi <i@hexilee.me>
Signed-off-by: xixi <i@hexilee.me>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants