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

Remove reclaim param for store_accounts_frozen #618

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 4 additions & 11 deletions accounts-db/src/accounts_db.rs
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,6 @@ impl CurrentAncientAccountsFile {
(self.slot(), accounts, accounts_to_store.slot()),
None::<Vec<AccountHash>>,
self.accounts_file(),
StoreReclaims::Ignore,
);
let bytes_written =
previous_available.saturating_sub(self.accounts_file().accounts.remaining_bytes());
Expand Down Expand Up @@ -3977,7 +3976,6 @@ impl AccountsDb {
(slot, &shrink_collect.alive_accounts.alive_accounts()[..]),
None::<Vec<AccountHash>>,
shrink_in_progress.new_storage(),
StoreReclaims::Ignore,
);

rewrite_elapsed.stop();
Expand Down Expand Up @@ -6282,13 +6280,9 @@ impl AccountsDb {
// will be able to find the account in storage
let flushed_store =
self.create_and_insert_store(slot, flush_stats.total_size.0, "flush_slot_cache");
let (store_accounts_timing_inner, store_accounts_total_inner_us) = measure_us!(self
.store_accounts_frozen(
(slot, &accounts[..]),
Some(hashes),
&flushed_store,
StoreReclaims::Ignore,
));
let (store_accounts_timing_inner, store_accounts_total_inner_us) = measure_us!(
self.store_accounts_frozen((slot, &accounts[..]), Some(hashes), &flushed_store,)
);
flush_stats.store_accounts_timing = store_accounts_timing_inner;
flush_stats.store_accounts_total_us = Saturating(store_accounts_total_inner_us);

Expand Down Expand Up @@ -8393,7 +8387,6 @@ impl AccountsDb {
accounts: impl StorableAccounts<'a, T>,
hashes: Option<Vec<impl Borrow<AccountHash>>>,
storage: &Arc<AccountStorageEntry>,
reclaim: StoreReclaims,
) -> StoreAccountsTiming {
// stores on a frozen slot should not reset
// the append vec so that hashing could happen on the store
Expand All @@ -8405,7 +8398,7 @@ impl AccountsDb {
&StoreTo::Storage(storage),
reset_accounts,
None,
reclaim,
StoreReclaims::Ignore,
UpdateIndexThreadSelection::PoolWithThreshold,
)
}
Expand Down
3 changes: 1 addition & 2 deletions accounts-db/src/ancient_append_vecs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use {
account_storage::{meta::StoredAccountMeta, ShrinkInProgress},
accounts_db::{
AccountStorageEntry, AccountsDb, AliveAccounts, GetUniqueAccountsResult, ShrinkCollect,
ShrinkCollectAliveSeparatedByRefs, ShrinkStatsSub, StoreReclaims,
ShrinkCollectAliveSeparatedByRefs, ShrinkStatsSub,
},
accounts_file::AccountsFile,
accounts_hash::AccountHash,
Expand Down Expand Up @@ -454,7 +454,6 @@ impl AccountsDb {
accounts_to_write,
None::<Vec<AccountHash>>,
shrink_in_progress.new_storage(),
StoreReclaims::Ignore,
));

write_ancient_accounts.metrics.accumulate(&ShrinkStatsSub {
Expand Down
5 changes: 1 addition & 4 deletions runtime/src/snapshot_minimizer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ use {
prelude::ParallelSlice,
},
solana_accounts_db::{
accounts_db::{
AccountStorageEntry, AccountsDb, GetUniqueAccountsResult, PurgeStats, StoreReclaims,
},
accounts_db::{AccountStorageEntry, AccountsDb, GetUniqueAccountsResult, PurgeStats},
accounts_partition,
},
solana_measure::measure,
Expand Down Expand Up @@ -371,7 +369,6 @@ impl<'a> SnapshotMinimizer<'a> {
(slot, &accounts[..]),
Some(hashes),
new_storage,
StoreReclaims::Ignore,
);

new_storage.flush().unwrap();
Expand Down
Loading