Skip to content

Add removed line from PR1192 #2249

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.

Sign up for GitHub

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

Merged
alessandrod merged 2 commits into from
Jul 27, 2024
Merged

Add removed line from PR1192 #2249

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b442d9d
Add removed line from PR1192
ksolana Jul 23, 2024
305a622
Test missing programs were loaded
ksolana Jul 23, 2024
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
9 changes: 8 additions & 1 deletion svm/src/transaction_processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ impl<FG: ForkGraph> TransactionBatchProcessor<FG> {
})
.collect();

let mut loaded_programs_for_txs = None;
let mut loaded_programs_for_txs: Option<ProgramCacheForTxBatch> = None;
loop {
let (program_to_store, task_cookie, task_waiter) = {
// Lock the global cache.
Expand Down Expand Up @@ -592,6 +592,7 @@ impl<FG: ForkGraph> TransactionBatchProcessor<FG> {
};

if let Some((key, program)) = program_to_store {
loaded_programs_for_txs.as_mut().unwrap().loaded_missing = true;
let mut program_cache = self.program_cache.write().unwrap();
// Submit our last completed loading task.
if program_cache.finish_cooperative_loading_task(self.slot, key, program)
Expand Down Expand Up @@ -1335,6 +1336,7 @@ mod tests {

let mut account_maps: HashMap<Pubkey, u64> = HashMap::new();
account_maps.insert(key, 4);
let mut loaded_missing = 0;

for limit_to_load_programs in [false, true] {
let result = batch_processor.replenish_program_cache(
Expand All @@ -1344,12 +1346,17 @@ mod tests {
limit_to_load_programs,
);
assert!(!result.hit_max_limit);
if result.loaded_missing {
loaded_missing += 1;
}

let program = result.find(&key).unwrap();
assert!(matches!(
program.program,
ProgramCacheEntryType::FailedVerification(_)
));
}
assert!(loaded_missing > 0);
}

#[test]
Expand Down