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

Add limit and shrink policy for recycler (bp #15320) #15565

Merged
merged 1 commit into from
Feb 27, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 26, 2021

This is an automatic backport of pull request #15320 done by Mergify.

Cherry-pick of c2e8814 has failed:

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

You are currently cherry-picking commit c2e8814dc.
  (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:   bench-streamer/src/main.rs
	modified:   core/src/cluster_info.rs
	modified:   core/src/fetch_stage.rs
	modified:   core/src/gossip_service.rs
	modified:   core/src/serve_repair.rs
	modified:   core/src/serve_repair_service.rs
	modified:   core/src/shred_fetch_stage.rs
	modified:   core/src/sigverify.rs
	modified:   core/src/sigverify_shreds.rs
	modified:   core/src/tpu.rs
	modified:   core/src/tvu.rs
	modified:   ledger/benches/sigverify_shreds.rs
	modified:   ledger/src/entry.rs
	modified:   ledger/src/sigverify_shreds.rs
	new file:   perf/benches/recycler.rs
	modified:   perf/benches/sigverify.rs
	modified:   perf/src/cuda_runtime.rs
	modified:   perf/src/packet.rs
	modified:   perf/src/recycler.rs
	modified:   perf/src/recycler_cache.rs
	modified:   perf/src/sigverify.rs
	modified:   streamer/src/streamer.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   perf/Cargo.toml

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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.io/

@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Feb 26, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Feb 26, 2021

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Feb 26, 2021
@carllin carllin force-pushed the mergify/bp/v1.5/pr-15320 branch from 9e943f9 to 2b88065 Compare February 26, 2021 22:36
@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 Feb 26, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Feb 26, 2021

automerge label removed due to a CI failure

@carllin carllin force-pushed the mergify/bp/v1.5/pr-15320 branch from 2b88065 to 18b97b6 Compare February 26, 2021 23:06
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Feb 26, 2021
@mergify mergify bot merged commit 087c43a into v1.5 Feb 27, 2021
@mergify mergify bot deleted the mergify/bp/v1.5/pr-15320 branch February 27, 2021 00:35
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.

1 participant