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

filters crds values in parallel when responding to gossip pull-requests (backport #18877) #18901

Merged
merged 2 commits into from
Jul 26, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 26, 2021

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

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

You are currently cherry-picking commit f1198fc6d.
  (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:   gossip/src/crds_gossip.rs
	modified:   gossip/src/gossip_service.rs
	modified:   gossip/tests/crds_gossip.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gossip/src/cluster_info.rs
	both modified:   gossip/src/crds_gossip_pull.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.io/

…ts (#18877)

When responding to gossip pull-requests, filter_crds_values takes a lot of time
while holding onto read-lock:
https://github.com/solana-labs/solana/blob/f51d64868/gossip/src/crds_gossip_pull.rs#L509-L566

This commit will filter-crds-values in parallel using rayon thread-pools.

(cherry picked from commit f1198fc)

# Conflicts:
#	gossip/src/cluster_info.rs
#	gossip/src/crds_gossip_pull.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Jul 26, 2021
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jul 26, 2021
@solana-grimes
Copy link
Contributor

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

@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 Jul 26, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 26, 2021

automerge label removed due to a CI failure

@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 Jul 26, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 26, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 26, 2021
@codecov
Copy link

codecov bot commented Jul 26, 2021

Codecov Report

Merging #18901 (60f952d) into v1.7 (aedcab8) will not change coverage.
The diff coverage is 92.8%.

@@           Coverage Diff           @@
##             v1.7   #18901   +/-   ##
=======================================
  Coverage    82.3%    82.3%           
=======================================
  Files         434      434           
  Lines      122714   122731   +17     
=======================================
+ Hits       101035   101049   +14     
- Misses      21679    21682    +3     

@mergify mergify bot merged commit 49b0d17 into v1.7 Jul 26, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-18877 branch July 26, 2021 21:30
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
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