Skip to content

Tracks last cleaned slot in accounts background service #6396

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
brooksprumo merged 1 commit into from
Jun 4, 2025
Merged

Tracks last cleaned slot in accounts background service #6396

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 14 additions & 14 deletions runtime/src/accounts_background_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ use {
};

const INTERVAL_MS: u64 = 100;
const CLEAN_INTERVAL_BLOCKS: u64 = 100;
const CLEAN_INTERVAL_SLOTS: Slot = 100;
const SHRINK_INTERVAL: Duration = Duration::from_secs(1);

pub type SnapshotRequestSender = Sender<SnapshotRequest>;
Expand Down Expand Up @@ -148,7 +148,7 @@ impl SnapshotRequestHandler {
test_hash_calculation: bool,
non_snapshot_time_us: u128,
exit: &AtomicBool,
) -> Option<Result<u64, SnapshotError>> {
) -> Option<Result<Slot, SnapshotError>> {
let (snapshot_request, num_outstanding_requests, num_re_enqueued_requests) =
self.get_next_snapshot_request()?;

Expand Down Expand Up @@ -273,7 +273,7 @@ impl SnapshotRequestHandler {
snapshot_request: SnapshotRequest,
accounts_package_kind: AccountsPackageKind,
exit: &AtomicBool,
) -> Result<u64, SnapshotError> {
) -> Result<Slot, SnapshotError> {
info!("handling snapshot request: {snapshot_request:?}, {accounts_package_kind:?}");
let mut total_time = Measure::start("snapshot_request_receiver_total_time");
let SnapshotRequest {
Expand Down Expand Up @@ -414,7 +414,7 @@ impl SnapshotRequestHandler {
("non_snapshot_time_us", non_snapshot_time_us, i64),
("shrink_ancient_time_us", shrink_ancient_time_us, i64),
);
Ok(snapshot_root_bank.block_height())
Ok(snapshot_root_bank.slot())
}
}

Expand Down Expand Up @@ -497,7 +497,7 @@ impl AbsRequestHandlers {
test_hash_calculation: bool,
non_snapshot_time_us: u128,
exit: &AtomicBool,
) -> Option<Result<u64, SnapshotError>> {
) -> Option<Result<Slot, SnapshotError>> {
self.snapshot_request_handler.handle_snapshot_requests(
test_hash_calculation,
non_snapshot_time_us,
Expand All @@ -520,7 +520,7 @@ impl AccountsBackgroundService {
) -> Self {
let is_running = Arc::new(AtomicBool::new(true));
let stop = Arc::new(AtomicBool::new(false));
let mut last_cleaned_block_height = 0;
let mut last_cleaned_slot = 0;
let mut removed_slots_count = 0;
let mut total_remove_slots_time = 0;
let t_background = Builder::new()
Expand Down Expand Up @@ -599,11 +599,11 @@ impl AccountsBackgroundService {

last_snapshot_end_time = Some(Instant::now());
match snapshot_handle_result {
Ok(snapshot_block_height) => {
Ok(snapshot_slot) => {
assert!(
last_cleaned_block_height <= snapshot_block_height,
"last cleaned block height: {last_cleaned_block_height}, \
snapshot request block height: {snapshot_block_height}, \
last_cleaned_slot <= snapshot_slot,
"last cleaned slot: {last_cleaned_slot}, \
snapshot request slot: {snapshot_slot}, \
is startup verification complete: {}, \
enqueued snapshot requests: {:?}",
bank.is_startup_verification_complete(),
Expand All @@ -613,7 +613,7 @@ impl AccountsBackgroundService {
.try_iter()
.collect::<Vec<_>>(),
);
last_cleaned_block_height = snapshot_block_height;
last_cleaned_slot = snapshot_slot;
previous_shrink_time = Instant::now();
}
Err(err) => {
Expand All @@ -625,16 +625,16 @@ impl AccountsBackgroundService {
break;
}
}
} else if bank.block_height() - last_cleaned_block_height
> (CLEAN_INTERVAL_BLOCKS + thread_rng().gen_range(0..10))
} else if bank.slot() - last_cleaned_slot
> (CLEAN_INTERVAL_SLOTS + thread_rng().gen_range(0..10))
{
// Note that the flush will do an internal clean of the
// cache up to bank.slot(), so should be safe as long
// as any later snapshots that are taken are of
// slots >= bank.slot()
bank.force_flush_accounts_cache();
bank.clean_accounts();
last_cleaned_block_height = bank.block_height();
last_cleaned_slot = bank.slot();
// Do not 'shrink' until *after* the startup verification is complete.
// This is because startup verification needs to get the snapshot
// storages *as they existed at startup* (to calculate the accounts
Expand Down
Loading