Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Don't forward packets received from TPU forwards port (backport #22078)#22170

Closed
mergify[bot] wants to merge 3 commits intov1.8from
mergify/bp/v1.8/pr-22078
Closed

Don't forward packets received from TPU forwards port (backport #22078)#22170
mergify[bot] wants to merge 3 commits intov1.8from
mergify/bp/v1.8/pr-22078

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Dec 29, 2021

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

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

You are currently cherry-picking commit b1d9a2e60.
  (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/commitment_service.rs
	modified:   core/src/fetch_stage.rs
	modified:   core/src/shred_fetch_stage.rs
	modified:   perf/src/data_budget.rs
	modified:   program-test/src/lib.rs
	modified:   rpc/src/rpc.rs
	modified:   runtime/src/bank.rs
	modified:   runtime/src/bank_forks.rs
	modified:   runtime/src/genesis_utils.rs
	modified:   sdk/src/packet.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   core/src/banking_stage.rs
	deleted by us:   core/src/vote_simulator.rs
	deleted by us:   rpc/src/cluster_tpu_info.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

* Don't forward packets received from TPU forwards port

* Add banking stage test

(cherry picked from commit b1d9a2e)

# Conflicts:
#	core/src/banking_stage.rs
#	core/src/vote_simulator.rs
#	rpc/src/cluster_tpu_info.rs
@mergify mergify Bot added the conflicts label Dec 29, 2021
@mergify mergify Bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Dec 29, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 29, 2021

automerge label removed due to a CI failure

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 30, 2021
@jstarry jstarry self-assigned this Dec 30, 2021
@solana-grimes
Copy link
Copy Markdown
Contributor

😱 New commits were pushed while the automerge label was present.

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 30, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 30, 2021
@jstarry jstarry added work in progress This isn't quite right yet and removed automerge Merge this Pull Request automatically once CI passes labels Dec 30, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 30, 2021
@jstarry jstarry removed automerge Merge this Pull Request automatically once CI passes conflicts labels Dec 30, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 30, 2021
@jstarry jstarry added noCI Suppress CI on this Pull Request and removed work in progress This isn't quite right yet automerge Merge this Pull Request automatically once CI passes labels Dec 30, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 30, 2021
@jstarry jstarry closed this Dec 30, 2021
@mergify mergify Bot deleted the mergify/bp/v1.8/pr-22078 branch December 30, 2021 02:47
@jstarry jstarry restored the mergify/bp/v1.8/pr-22078 branch December 30, 2021 02:47
@jstarry
Copy link
Copy Markdown
Contributor

jstarry commented Dec 30, 2021

Closed in favor of #22180

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 3, 2022

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Apr 3, 2022
@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Apr 3, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

locked PR noCI Suppress CI on this Pull Request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants