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

Fix fannout gossip bench (bp #10509) #10556

Merged
merged 2 commits into from
Jun 14, 2020
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 14, 2020

This is an automated backport of pull request #10509 done by Mergify

Cherry-pick of ba83e4c has failed:

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

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

Changes to be committed:

	modified:   core/src/banking_stage.rs
	modified:   core/src/crds.rs
	modified:   core/src/crds_gossip.rs
	modified:   core/src/crds_gossip_error.rs
	modified:   core/src/crds_gossip_pull.rs
	modified:   core/src/replay_stage.rs
	modified:   core/tests/gossip.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   core/src/cluster_info.rs
	both modified:   core/src/crds_gossip_push.rs

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 simulator.

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

@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Jun 14, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jun 14, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@aeyakovenko
Copy link
Member

needs #10557

@aeyakovenko aeyakovenko requested a review from mvines June 14, 2020 05:56
@aeyakovenko aeyakovenko force-pushed the mergify/bp/v1.2/pr-10509 branch from d3f131c to 8def8c7 Compare June 14, 2020 13:41
* Gossip benchmark

* Rayon tweaking

* push pulls

* fanout to max nodes

* fixup! fanout to max nodes

* fixup! fixup! fanout to max nodes

* update

* multi vote test

* fixup prune

* fast propagation

* fixups

* compute up to 95%

* test for specific tx

* stats

* stats

* fixed tests

* rename

* track a lagging view of which nodes have the local node in their active set in the local received_cache

* test fixups

* dups are old now

* dont prune your own origin

* send vote to tpu

* tests

* fixed tests

* fixed test

* update

* ignore scale

* lint

* fixup

* fixup

* fixup

* cleanup

Co-authored-by: Stephen Akridge <sakridge@gmail.com>
(cherry picked from commit ba83e4c)

fixup! Fix fannout gossip bench (#10509)

fixup! fixup! Fix fannout gossip bench (#10509)
@aeyakovenko aeyakovenko force-pushed the mergify/bp/v1.2/pr-10509 branch from 83993aa to 1c5e9b4 Compare June 14, 2020 14:21
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 14, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jun 14, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 14, 2020
@codecov
Copy link

codecov bot commented Jun 14, 2020

Codecov Report

Merging #10556 into v1.2 will increase coverage by 0.1%.
The diff coverage is 85.5%.

@@           Coverage Diff            @@
##            v1.2   #10556     +/-   ##
========================================
+ Coverage   81.7%    81.8%   +0.1%     
========================================
  Files        297      297             
  Lines      69954    69993     +39     
========================================
+ Hits       57189    57293    +104     
+ Misses     12765    12700     -65     

@solana-grimes solana-grimes merged commit f13498b into v1.2 Jun 14, 2020
@mergify mergify bot deleted the mergify/bp/v1.2/pr-10509 branch June 14, 2020 15:52
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants