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

v1.14: moves turbine-disabled check to shred-fetch-stage (backport of #30799) #30828

Merged
merged 2 commits into from
Mar 21, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 21, 2023

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

On branch mergify/bp/v1.14/pr-30799
Your branch is up to date with 'origin/v1.14'.

You are currently cherry-picking commit e66edeb18.
  (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:   core/src/sigverify_shreds.rs
	modified:   core/src/tvu.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/shred_fetch_stage.rs

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

If turbine_disabled is true, the commit discards turbine packets
earlier in the pipeline so that they won't interfere with the deduper
and the packets can get through once turbine is enabled again.

This is a prerequisite of:
#30786
so that local-cluster tests pass.

(cherry picked from commit e66edeb)

# Conflicts:
#	core/src/shred_fetch_stage.rs
@behzadnouri behzadnouri added the automerge Merge this Pull Request automatically once CI passes label Mar 21, 2023
@mergify mergify bot merged commit 0521136 into v1.14 Mar 21, 2023
@mergify mergify bot deleted the mergify/bp/v1.14/pr-30799 branch March 21, 2023 18:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants