improve BankCreationFreezingProgress and add tests (#30513)
This commit is contained in:
parent
2500fd3f01
commit
85eaf1e7ab
|
@ -172,7 +172,7 @@ use {
|
|||
sync::{
|
||||
atomic::{
|
||||
AtomicBool, AtomicI64, AtomicU64, AtomicUsize,
|
||||
Ordering::{AcqRel, Acquire, Relaxed, Release},
|
||||
Ordering::{AcqRel, Acquire, Relaxed},
|
||||
},
|
||||
Arc, LockResult, RwLock, RwLockReadGuard, RwLockWriteGuard,
|
||||
},
|
||||
|
@ -1791,8 +1791,7 @@ impl Bank {
|
|||
.accounts
|
||||
.accounts_db
|
||||
.bank_progress
|
||||
.bank_creation_count
|
||||
.fetch_add(1, Release);
|
||||
.increment_bank_creation_count();
|
||||
}
|
||||
|
||||
fn bank_frozen_or_destroyed(&self) {
|
||||
|
@ -1804,8 +1803,7 @@ impl Bank {
|
|||
.accounts
|
||||
.accounts_db
|
||||
.bank_progress
|
||||
.bank_freeze_or_destruction_count
|
||||
.fetch_add(1, Release);
|
||||
.increment_bank_frozen_or_destroyed();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,8 +1,12 @@
|
|||
//! Keep track of how many banks have been created and how many have been frozen or dropped.
|
||||
//! This is useful to track foreground progress to understand expected access to accounts db.
|
||||
use {
|
||||
crate::waitable_condvar::WaitableCondvar,
|
||||
solana_sdk::timing::AtomicInterval,
|
||||
std::sync::atomic::{AtomicU32, Ordering},
|
||||
std::sync::{
|
||||
atomic::{AtomicU32, Ordering},
|
||||
Arc,
|
||||
},
|
||||
};
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
|
@ -12,30 +16,98 @@ use {
|
|||
pub(crate) struct BankCreationFreezingProgress {
|
||||
/// Incremented each time a bank is created.
|
||||
/// Starting now, this bank could be finding accounts in the index and loading them from accounts db.
|
||||
pub(crate) bank_creation_count: AtomicU32,
|
||||
bank_creation_count: AtomicU32,
|
||||
/// Incremented each time a bank is frozen or destroyed.
|
||||
/// At this point, this bank has completed all account loading.
|
||||
pub(crate) bank_freeze_or_destruction_count: AtomicU32,
|
||||
bank_freeze_or_destruction_count: AtomicU32,
|
||||
|
||||
/// enable waiting for bank_freeze_or_destruction_count to increment
|
||||
bank_frozen_or_destroyed: Arc<WaitableCondvar>,
|
||||
|
||||
last_report: AtomicInterval,
|
||||
}
|
||||
|
||||
impl BankCreationFreezingProgress {
|
||||
pub(crate) fn increment_bank_frozen_or_destroyed(&self) {
|
||||
self.bank_freeze_or_destruction_count
|
||||
.fetch_add(1, Ordering::Release);
|
||||
self.bank_frozen_or_destroyed.notify_all();
|
||||
}
|
||||
|
||||
pub(crate) fn get_bank_frozen_or_destroyed_count(&self) -> u32 {
|
||||
self.bank_freeze_or_destruction_count
|
||||
.load(Ordering::Acquire)
|
||||
}
|
||||
|
||||
pub(crate) fn increment_bank_creation_count(&self) {
|
||||
self.bank_creation_count.fetch_add(1, Ordering::Release);
|
||||
}
|
||||
|
||||
pub(crate) fn get_bank_creation_count(&self) -> u32 {
|
||||
self.bank_creation_count.load(Ordering::Acquire)
|
||||
}
|
||||
|
||||
pub(crate) fn report(&self) {
|
||||
if self.last_report.should_update(60_000) {
|
||||
datapoint_info!(
|
||||
"bank_progress",
|
||||
(
|
||||
"difference",
|
||||
self.bank_creation_count
|
||||
.load(Ordering::Acquire)
|
||||
.wrapping_sub(
|
||||
self.bank_freeze_or_destruction_count
|
||||
.load(Ordering::Acquire)
|
||||
),
|
||||
self.get_bank_creation_count()
|
||||
.wrapping_sub(self.get_bank_frozen_or_destroyed_count()),
|
||||
i64
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
pub mod tests {
|
||||
use {super::*, solana_sdk::timing::timestamp, std::thread::Builder};
|
||||
|
||||
#[test]
|
||||
fn test_count() {
|
||||
solana_logger::setup();
|
||||
let progress = BankCreationFreezingProgress::default();
|
||||
assert_eq!(progress.get_bank_creation_count(), 0);
|
||||
assert_eq!(progress.get_bank_frozen_or_destroyed_count(), 0);
|
||||
progress.increment_bank_creation_count();
|
||||
assert_eq!(progress.get_bank_creation_count(), 1);
|
||||
assert_eq!(progress.get_bank_frozen_or_destroyed_count(), 0);
|
||||
progress.increment_bank_frozen_or_destroyed();
|
||||
assert_eq!(progress.get_bank_creation_count(), 1);
|
||||
assert_eq!(progress.get_bank_frozen_or_destroyed_count(), 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_wait() {
|
||||
solana_logger::setup();
|
||||
let progress = BankCreationFreezingProgress::default();
|
||||
let waiter = progress.bank_frozen_or_destroyed.clone();
|
||||
let duration = std::time::Duration::default();
|
||||
assert!(waiter.wait_timeout(duration));
|
||||
let tester = Arc::new(AtomicU32::default());
|
||||
let tester2 = tester.clone();
|
||||
|
||||
let thread = Builder::new()
|
||||
.name("test_wait".to_string())
|
||||
.spawn(move || {
|
||||
assert!(!waiter.wait_timeout(std::time::Duration::from_secs(5)));
|
||||
tester2.store(1, Ordering::Release);
|
||||
})
|
||||
.unwrap();
|
||||
let start = timestamp();
|
||||
let mut i = 0;
|
||||
while tester.load(Ordering::Acquire) == 0 {
|
||||
// keep incrementing until the waiter thread has picked up the notification that we incremented
|
||||
progress.increment_bank_frozen_or_destroyed();
|
||||
i += 1;
|
||||
assert_eq!(progress.get_bank_frozen_or_destroyed_count(), i);
|
||||
let now = timestamp();
|
||||
let elapsed = now.wrapping_sub(start);
|
||||
assert!(elapsed < 5_000, "elapsed: {elapsed}");
|
||||
}
|
||||
thread.join().expect("failed");
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue