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: Feature - Epoch boundary recompilation phase (backport of #33477) #34003

Merged
merged 1 commit into from
Nov 9, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 9, 2023

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

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

You are currently cherry-picking commit a9509f56b7.
  (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:   ledger-tool/src/program.rs
	modified:   program-runtime/src/loaded_programs.rs
	modified:   runtime/src/bank.rs
	modified:   runtime/src/bank/metrics.rs

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

@mergify mergify bot added the conflicts label Nov 9, 2023
@mergify mergify bot assigned Lichtso Nov 9, 2023
@Lichtso Lichtso removed the conflicts label Nov 9, 2023
* Adds LoadedPrograms::upcoming_environments.

* Moves LoadedPrograms::prune_feature_set_transition() into LoadedPrograms::prune().

* Adds parameter recompile to Bank::load_program().

* Sets latest_root_slot/epoch and environments in Bank::finish_init().

* Removes FEATURES_AFFECTING_RBPF list.

* Adjusts test_feature_activation_loaded_programs_recompilation_phase().

(cherry picked from commit a9509f5)
@Lichtso Lichtso force-pushed the mergify/bp/v1.17/pr-33477 branch from f06fd65 to 5e1fba1 Compare November 9, 2023 13:05
Copy link

codecov bot commented Nov 9, 2023

Codecov Report

Merging #34003 (5e1fba1) into v1.17 (6209b3b) will increase coverage by 0.0%.
The diff coverage is 77.7%.

@@           Coverage Diff           @@
##            v1.17   #34003   +/-   ##
=======================================
  Coverage    81.8%    81.8%           
=======================================
  Files         803      803           
  Lines      217872   217916   +44     
=======================================
+ Hits       178311   178396   +85     
+ Misses      39561    39520   -41     

@Lichtso Lichtso merged commit 956eacb into v1.17 Nov 9, 2023
31 checks passed
@Lichtso Lichtso deleted the mergify/bp/v1.17/pr-33477 branch November 9, 2023 17:37
anwayde pushed a commit to firedancer-io/solana that referenced this pull request Nov 16, 2023
…na-labs#33477) (solana-labs#34003)

Feature - Epoch boundary recompilation phase (solana-labs#33477)

* Adds LoadedPrograms::upcoming_environments.

* Moves LoadedPrograms::prune_feature_set_transition() into LoadedPrograms::prune().

* Adds parameter recompile to Bank::load_program().

* Sets latest_root_slot/epoch and environments in Bank::finish_init().

* Removes FEATURES_AFFECTING_RBPF list.

* Adjusts test_feature_activation_loaded_programs_recompilation_phase().

(cherry picked from commit a9509f5)

Co-authored-by: Alexander Meißner <AlexanderMeissner@gmx.net>
anwayde pushed a commit to firedancer-io/solana that referenced this pull request Nov 16, 2023
…na-labs#33477) (solana-labs#34003)

Feature - Epoch boundary recompilation phase (solana-labs#33477)

* Adds LoadedPrograms::upcoming_environments.

* Moves LoadedPrograms::prune_feature_set_transition() into LoadedPrograms::prune().

* Adds parameter recompile to Bank::load_program().

* Sets latest_root_slot/epoch and environments in Bank::finish_init().

* Removes FEATURES_AFFECTING_RBPF list.

* Adjusts test_feature_activation_loaded_programs_recompilation_phase().

(cherry picked from commit a9509f5)

Co-authored-by: Alexander Meißner <AlexanderMeissner@gmx.net>
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