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

Use current root slot to disambiguate pruning of old programs #31548

Merged
merged 3 commits into from
May 9, 2023
Merged

Use current root slot to disambiguate pruning of old programs #31548

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6831285
Use current root slot to unambiguate pruning of old programs
pgarg66 May 8, 2023
9a3b014
simplify the change
pgarg66 May 9, 2023
eae13f0
address comment
pgarg66 May 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion program-runtime/src/loaded_programs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,7 @@ impl LoadedPrograms {

/// Before rerooting the blockstore this removes all programs of orphan forks
pub fn prune<F: ForkGraph>(&mut self, fork_graph: &F, new_root: Slot) {
let previous_root = self.latest_root;
self.entries.retain(|_key, second_level| {
let mut first_ancestor_found = false;
*second_level = second_level
Expand All @@ -383,7 +384,10 @@ impl LoadedPrograms {
let relation = fork_graph.relationship(entry.deployment_slot, new_root);
if entry.deployment_slot >= new_root {
matches!(relation, BlockRelation::Equal | BlockRelation::Descendant)
} else if !first_ancestor_found && matches!(relation, BlockRelation::Ancestor) {
} else if !first_ancestor_found
&& (matches!(relation, BlockRelation::Ancestor)
|| entry.deployment_slot < previous_root)
{
first_ancestor_found = true;
first_ancestor_found
} else {
Expand Down