Revert "collect rent in parallel for partitions (#19478)" (#19723)

This reverts commit 1560d5e3c3.
This commit is contained in:
Jeff Washington (jwash)
2021-09-08 21:27:08 -05:00
committed by GitHub
parent 97418bede3
commit 8489ee7df9

View File

@ -65,10 +65,7 @@ use crate::{
use byteorder::{ByteOrder, LittleEndian};
use itertools::Itertools;
use log::*;
use rayon::{
iter::{IntoParallelIterator, ParallelIterator},
ThreadPool,
};
use rayon::ThreadPool;
use solana_measure::measure::Measure;
use solana_metrics::{datapoint_debug, inc_new_counter_debug, inc_new_counter_info};
use solana_program_runtime::{ExecuteDetailsTimings, Executors};
@ -3867,13 +3864,9 @@ impl Bank {
}
let mut measure = Measure::start("collect_rent_eagerly-ms");
self.rc.accounts.accounts_db.thread_pool.install(|| {
self.rent_collection_partitions()
.into_par_iter()
.for_each(|partition| {
self.collect_rent_in_partition(partition);
});
});
for partition in self.rent_collection_partitions() {
self.collect_rent_in_partition(partition);
}
measure.stop();
inc_new_counter_info!("collect_rent_eagerly-ms", measure.as_ms() as usize);
}