diff --git a/pageserver/src/tenant/remote_timeline_client.rs b/pageserver/src/tenant/remote_timeline_client.rs index 6f42b54ac2..72ece7f6a7 100644 --- a/pageserver/src/tenant/remote_timeline_client.rs +++ b/pageserver/src/tenant/remote_timeline_client.rs @@ -1405,13 +1405,13 @@ pub fn remote_layer_path( tenant_id: &TenantId, timeline_id: &TimelineId, layer_file_name: &LayerFileName, - layer_meta: &LayerFileMetadata, + generation: Generation, ) -> RemotePath { // Generation-aware key format let path = format!( "tenants/{tenant_id}/{TIMELINES_SEGMENT_NAME}/{timeline_id}/{0}{1}", layer_file_name.file_name(), - layer_meta.generation.get_suffix() + generation.get_suffix() ); RemotePath::from_string(&path).expect("Failed to construct path") diff --git a/pageserver/src/tenant/remote_timeline_client/download.rs b/pageserver/src/tenant/remote_timeline_client/download.rs index 9863215529..5c173c613f 100644 --- a/pageserver/src/tenant/remote_timeline_client/download.rs +++ b/pageserver/src/tenant/remote_timeline_client/download.rs @@ -50,7 +50,12 @@ pub async fn download_layer_file<'a>( .timeline_path(&tenant_id, &timeline_id) .join(layer_file_name.file_name()); - let remote_path = remote_layer_path(&tenant_id, &timeline_id, layer_file_name, layer_metadata); + let remote_path = remote_layer_path( + &tenant_id, + &timeline_id, + layer_file_name, + layer_metadata.generation, + ); // Perform a rename inspired by durable_rename from file_utils.c. // The sequence: