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

Do not prune cache entry if the runtime environment is different #34100

Merged
merged 2 commits into from
Nov 18, 2023

Conversation

pgarg66
Copy link
Contributor

@pgarg66 pgarg66 commented Nov 16, 2023

Problem

LoadedPrograms::prune() should not remove an old entry if the runtime environment has changed. The old entry could still be getting used to replay old slots (slots corresponding to the old environment).

Summary of Changes

Check if the environment matches before pruning the old entry.

Fixes #

Copy link

codecov bot commented Nov 16, 2023

Codecov Report

Merging #34100 (048699b) into master (6c62ad7) will increase coverage by 0.0%.
Report is 1380 commits behind head on master.
The diff coverage is 90.9%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #34100      +/-   ##
==========================================
  Coverage    81.8%    81.9%              
==========================================
  Files         766      819      +53     
  Lines      209158   220170   +11012     
==========================================
+ Hits       171210   180430    +9220     
- Misses      37948    39740    +1792     

@pgarg66 pgarg66 marked this pull request as ready for review November 16, 2023 01:40
@pgarg66 pgarg66 requested a review from Lichtso November 16, 2023 01:40
@Lichtso Lichtso added the v1.17 PRs that should be backported to v1.17 label Nov 16, 2023
Copy link
Contributor

mergify bot commented Nov 17, 2023

Backports to the beta branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule. Exceptions include CI/metrics changes, CLI improvements and documentation updates on a case by case basis.

@Lichtso Lichtso merged commit 3368579 into solana-labs:master Nov 18, 2023
32 checks passed
mergify bot pushed a commit that referenced this pull request Nov 18, 2023
@pgarg66 pgarg66 deleted the cache-prune-fixes branch November 19, 2023 13:21
pgarg66 added a commit that referenced this pull request Nov 20, 2023
pgarg66 added a commit that referenced this pull request Nov 20, 2023
…nt (backport of #34100) (#34163)

Do not prune cache entry if the runtime environment is different (#34100)

(cherry picked from commit 3368579)

Co-authored-by: Pankaj Garg <pankaj@solana.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v1.17 PRs that should be backported to v1.17
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants