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

v1.17: Add metrics for locking the blockhash queue in banking stage (backport of #34382) #34384

Merged
merged 2 commits into from
Dec 9, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 9, 2023

This is an automatic backport of pull request #34382 done by Mergify.
Cherry-pick of 2971e84 has failed:

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

You are currently cherry-picking commit 2971e84ec8.
  (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/banking_stage/committer.rs
	modified:   core/src/banking_stage/consumer.rs
	modified:   core/src/banking_stage/leader_slot_timing_metrics.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/banking_stage/consume_worker.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

(cherry picked from commit 2971e84)

# Conflicts:
#	core/src/banking_stage/consume_worker.rs
@mergify mergify bot added the conflicts label Dec 9, 2023
@mergify mergify bot assigned jstarry Dec 9, 2023
Copy link

codecov bot commented Dec 9, 2023

Codecov Report

Merging #34384 (addc566) into v1.17 (78e7796) will increase coverage by 0.0%.
The diff coverage is 100.0%.

Additional details and impacted files
@@           Coverage Diff           @@
##            v1.17   #34384   +/-   ##
=======================================
  Coverage    81.8%    81.8%           
=======================================
  Files         803      803           
  Lines      218173   218176    +3     
=======================================
+ Hits       178526   178556   +30     
+ Misses      39647    39620   -27     

@t-nelson t-nelson added the automerge Merge this Pull Request automatically once CI passes label Dec 9, 2023
@CriesofCarrots CriesofCarrots merged commit daf3730 into v1.17 Dec 9, 2023
31 checks passed
@CriesofCarrots CriesofCarrots deleted the mergify/bp/v1.17/pr-34382 branch December 9, 2023 17:07
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.

None yet

3 participants