rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-15 17:32:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

last_tenant_id for measuring progress

Browse Source
This commit is contained in:
Joonas Koivunen
2023-12-21 13:23:39 +00:00
parent 3432805e25
commit e0aa2e2244
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
s3_scrubber/src/scan_metadata.rs
View File

@@ -221,6 +221,7 @@ pub async fn scan_metadata(
let spawned_timelines = Arc::new(AtomicUsize::new(0));
let completed_tenants = AtomicUsize::new(0);
let completed_timelines = AtomicUsize::new(0);
let last_tenant_id = std::cell::RefCell::new(None);
let s3_client = s3_client.clone();
let target = target.clone();
@@ -317,6 +318,8 @@ pub async fn scan_metadata(
more_tenants = js.len() < 1000;
spawned_tenants.fetch_add(1, Ordering::Relaxed);
*last_tenant_id.borrow_mut() = Some(tenant_shard_id);
}
Either::Right((tenant_shard_id, timelines)) => {
for timeline_id in timelines {
@@ -370,11 +373,11 @@ pub async fn scan_metadata(
match res {
Ok(()) => {
tracing::info!("progress tenants: {completed_tenants} / {spawned_tenants}, timelines: {completed_timelines} / {spawned_timelines} after {:?}", started_at.elapsed());
tracing::info!("progress tenants: {completed_tenants:>6} / {spawned_tenants:<6}, timelines: {completed_timelines:>6} / {spawned_timelines:<6} after {:?}", started_at.elapsed());
break;
}
Err(_timeout) => {
tracing::info!("progress tenants: {completed_tenants} / {spawned_tenants}, timelines: {completed_timelines} / {spawned_timelines}");
tracing::info!("progress tenants: {completed_tenants:>6} / {spawned_tenants:<6}, timelines: {completed_timelines:>6} / {spawned_timelines:<6}, last tenant: {:?}", &*last_tenant_id.borrow());
}
}
}