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: Fix - LoadedPrograms statistics (backport of #35026) #35050

Merged
merged 1 commit into from
Feb 5, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 2, 2024

This is an automatic backport of pull request #35026 done by Mergify.
Cherry-pick of 5dd9609 has failed:

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

You are currently cherry-picking commit 5dd9609aea.
  (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:   runtime/src/bank.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   program-runtime/src/loaded_programs.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/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

@mergify mergify bot added the conflicts label Feb 2, 2024
@mergify mergify bot assigned Lichtso Feb 2, 2024
@Lichtso Lichtso force-pushed the mergify/bp/v1.17/pr-35026 branch from 3f2955d to a51b5b3 Compare February 2, 2024 16:05
pgarg66
pgarg66 previously approved these changes Feb 2, 2024
@Lichtso Lichtso removed the conflicts label Feb 2, 2024
Lichtso
Lichtso previously approved these changes Feb 2, 2024
Fixes hits, misses.
Adds reloads, lost_insertions.
Removes prunes_expired.

(cherry picked from commit 5dd9609)
@Lichtso Lichtso dismissed stale reviews from pgarg66 and themself via c16bf1a February 3, 2024 00:54
@Lichtso Lichtso force-pushed the mergify/bp/v1.17/pr-35026 branch from a51b5b3 to c16bf1a Compare February 3, 2024 00:54
Copy link

codecov bot commented Feb 3, 2024

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (b8ac425) 81.7% compared to head (c16bf1a) 81.7%.

Additional details and impacted files
@@           Coverage Diff           @@
##            v1.17   #35050   +/-   ##
=======================================
  Coverage    81.7%    81.7%           
=======================================
  Files         806      806           
  Lines      218966   218978   +12     
=======================================
+ Hits       178905   178946   +41     
+ Misses      40061    40032   -29     

@Lichtso Lichtso merged commit a4621d8 into v1.17 Feb 5, 2024
33 checks passed
@Lichtso Lichtso deleted the mergify/bp/v1.17/pr-35026 branch February 5, 2024 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants