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.

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

pageserver: fix a warning on secondary mode downloads after evictions #7877

Merged
merged 2 commits into from
May 28, 2024
Merged

pageserver: fix a warning on secondary mode downloads after evictions #7877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00a44a3
pageserver: fix secondary progress stats warning after eviction
jcsp May 24, 2024
e32889f
pageserver: log on secondary layer eviction
jcsp May 24, 2024
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
1 change: 1 addition & 0 deletions pageserver/src/tenant/secondary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ impl SecondaryTenant {
};

let now = SystemTime::now();
tracing::info!("Evicting secondary layer");

let this = self.clone();

Expand Down
18 changes: 11 additions & 7 deletions pageserver/src/tenant/secondary/downloader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,6 +909,7 @@ impl<'a> TenantDownloader<'a> {
strftime(&layer.access_time),
strftime(evicted_at)
);
self.skip_layer(layer);
continue;
}
}
Expand Down Expand Up @@ -963,6 +964,15 @@ impl<'a> TenantDownloader<'a> {
Ok(())
}

/// Call this during timeline download if a layer will _not_ be downloaded, to update progress statistics
fn skip_layer(&self, layer: HeatMapLayer) {
let mut progress = self.secondary_state.progress.lock().unwrap();
progress.layers_total = progress.layers_total.saturating_sub(1);
progress.bytes_total = progress
.bytes_total
.saturating_sub(layer.metadata.file_size);
}

async fn download_layer(
&self,
tenant_shard_id: &TenantShardId,
Expand Down Expand Up @@ -1012,13 +1022,7 @@ impl<'a> TenantDownloader<'a> {
"Skipped downloading missing layer {}, raced with compaction/gc?",
layer.name
);

// If the layer is 404, adjust the progress statistics to reflect that we will not download it.
let mut progress = self.secondary_state.progress.lock().unwrap();
progress.layers_total = progress.layers_total.saturating_sub(1);
progress.bytes_total = progress
.bytes_total
.saturating_sub(layer.metadata.file_size);
self.skip_layer(layer);

return Ok(None);
}
Expand Down
Loading