From b630c9c0d1e0af939c777e625e67bf33b242ac61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arpad=20M=C3=BCller?= Date: Thu, 17 Oct 2024 19:36:30 +0200 Subject: [PATCH] fmt --- .../src/tenant/remote_timeline_client/download.rs | 10 +++++++--- .../src/tenant/remote_timeline_client/manifest.rs | 2 +- pageserver/src/tenant/remote_timeline_client/upload.rs | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pageserver/src/tenant/remote_timeline_client/download.rs b/pageserver/src/tenant/remote_timeline_client/download.rs index ef11e895141b5..48bc9fc148e02 100644 --- a/pageserver/src/tenant/remote_timeline_client/download.rs +++ b/pageserver/src/tenant/remote_timeline_client/download.rs @@ -35,7 +35,9 @@ use utils::pausable_failpoint; use super::index::{IndexPart, LayerFileMetadata}; use super::manifest::TenantManifest; use super::{ - parse_remote_index_path, remote_index_path, remote_initdb_archive_path, remote_initdb_preserved_archive_path, remote_tenant_manifest_path, remote_tenant_path, FAILED_DOWNLOAD_WARN_THRESHOLD, FAILED_REMOTE_OP_RETRIES, INITDB_PATH + parse_remote_index_path, remote_index_path, remote_initdb_archive_path, + remote_initdb_preserved_archive_path, remote_tenant_manifest_path, remote_tenant_path, + FAILED_DOWNLOAD_WARN_THRESHOLD, FAILED_REMOTE_OP_RETRIES, INITDB_PATH, }; /// @@ -371,7 +373,8 @@ pub async fn do_download_tenant_manifest( let generation = Generation::none(); let remote_path = remote_tenant_manifest_path(tenant_shard_id, generation); - let tenant_manifest_bytes = do_download_remote_path_retry_forever(storage, &remote_path, cancel).await?; + let tenant_manifest_bytes = + do_download_remote_path_retry_forever(storage, &remote_path, cancel).await?; let tenant_manifest: TenantManifest = serde_json::from_slice(&tenant_manifest_bytes) .with_context(|| format!("deserialize tenant manifest file at {remote_path:?}")) @@ -389,7 +392,8 @@ async fn do_download_index_part( ) -> Result<(IndexPart, Generation), DownloadError> { let remote_path = remote_index_path(tenant_shard_id, timeline_id, index_generation); - let index_part_bytes = do_download_remote_path_retry_forever(storage, &remote_path, cancel).await?; + let index_part_bytes = + do_download_remote_path_retry_forever(storage, &remote_path, cancel).await?; let index_part: IndexPart = serde_json::from_slice(&index_part_bytes) .with_context(|| format!("deserialize index part file at {remote_path:?}")) diff --git a/pageserver/src/tenant/remote_timeline_client/manifest.rs b/pageserver/src/tenant/remote_timeline_client/manifest.rs index 3bd1dc30ed1e0..ebe956aa48cf6 100644 --- a/pageserver/src/tenant/remote_timeline_client/manifest.rs +++ b/pageserver/src/tenant/remote_timeline_client/manifest.rs @@ -34,4 +34,4 @@ impl TenantManifest { pub fn to_s3_bytes(&self) -> serde_json::Result> { serde_json::to_vec(self) } -} \ No newline at end of file +} diff --git a/pageserver/src/tenant/remote_timeline_client/upload.rs b/pageserver/src/tenant/remote_timeline_client/upload.rs index 497810f23a6bf..f41e446bf32ec 100644 --- a/pageserver/src/tenant/remote_timeline_client/upload.rs +++ b/pageserver/src/tenant/remote_timeline_client/upload.rs @@ -16,7 +16,8 @@ use super::index::IndexPart; use super::manifest::TenantManifest; use super::Generation; use crate::tenant::remote_timeline_client::{ - remote_index_path, remote_initdb_archive_path, remote_initdb_preserved_archive_path, remote_tenant_manifest_path, + remote_index_path, remote_initdb_archive_path, remote_initdb_preserved_archive_path, + remote_tenant_manifest_path, }; use remote_storage::{GenericRemoteStorage, RemotePath, TimeTravelError}; use utils::id::{TenantId, TimelineId};