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

[8.4](backport #1896) Catch error in waitBulkAction. Add bulk.WithRetryOnConflict(3) in multiple places. #1941

Merged
merged 3 commits into from
Sep 30, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 30, 2022

This is an automatic backport of pull request #1896 done by Mergify.
Cherry-pick of f77b97c has failed:

On branch mergify/bp/8.4/pr-1896
Your branch is up to date with 'origin/8.4'.

You are currently cherry-picking commit f77b97c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   internal/pkg/api/handleAck.go
	modified:   internal/pkg/bulk/opBulk.go
	modified:   internal/pkg/coordinator/monitor.go
	modified:   internal/pkg/dl/servers.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.next.asciidoc
	both modified:   internal/pkg/policy/policy_output.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…tiple places. (#1896)

* Catch error in waitBulkAction. Add bulk.WithRetryOnConflict(3) in multiple places.

* Add changelog entry.

* Update CHANGELOG.next.asciidoc

Co-authored-by: Craig MacKenzie <[email protected]>

Co-authored-by: Craig MacKenzie <[email protected]>
(cherry picked from commit f77b97c)

# Conflicts:
#	CHANGELOG.next.asciidoc
#	internal/pkg/policy/policy_output.go
@mergify mergify bot requested a review from a team as a code owner September 30, 2022 14:09
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 30, 2022
@elasticmachine
Copy link
Contributor

elasticmachine commented Sep 30, 2022

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-09-30T17:58:38.804+0000

  • Duration: 11 min 6 sec

Test stats 🧪

Test Results
Failed 0
Passed 307
Skipped 1
Total 308

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

Copy link
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

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

+1

@blakerouse blakerouse merged commit 7e12ba1 into 8.4 Sep 30, 2022
@blakerouse blakerouse deleted the mergify/bp/8.4/pr-1896 branch September 30, 2022 19:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants