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

v1.16: Update ShredFetchStage::modify_packets to drop root bank quicker (backport of #33105) #33152

Merged
merged 2 commits into from
Sep 6, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 5, 2023

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

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

You are currently cherry-picking commit ad33c68ce9.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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

)

This function used to contain feature gate activation checks that
required access to a bank. Those checks have been cleaned up, so we no
longer need access to a full Bank. Rather, we can momentarily get a Bank
from BankForks, calculate the necessary results and then drop the Bank
along with the BankForks read lock.

(cherry picked from commit ad33c68)

# Conflicts:
#	core/src/shred_fetch_stage.rs
@mergify mergify bot added the conflicts label Sep 5, 2023
@mergify mergify bot assigned steviez Sep 5, 2023
@codecov
Copy link

codecov bot commented Sep 5, 2023

Codecov Report

Merging #33152 (94c6518) into v1.16 (6fbe8ba) will decrease coverage by 0.1%.
Report is 35 commits behind head on v1.16.
The diff coverage is 91.9%.

@@            Coverage Diff            @@
##            v1.16   #33152     +/-   ##
=========================================
- Coverage    81.9%    81.9%   -0.1%     
=========================================
  Files         762      762             
  Lines      208010   207801    -209     
=========================================
- Hits       170533   170334    -199     
+ Misses      37477    37467     -10     

@steviez steviez requested a review from behzadnouri September 6, 2023 12:27
@steviez steviez merged commit 90d9839 into v1.16 Sep 6, 2023
@steviez steviez deleted the mergify/bp/v1.16/pr-33105 branch September 6, 2023 12:33
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants