From e0d41ac6a3245ac337de3352b6e4e1662977574e Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Mon, 13 Dec 2021 14:43:56 +0200 Subject: [PATCH] Move constants related to metadata file to metadata.rs. They're not used anywhere else, so seems like a better place. --- pageserver/src/layered_repository.rs | 5 ----- pageserver/src/layered_repository/metadata.rs | 10 ++++++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pageserver/src/layered_repository.rs b/pageserver/src/layered_repository.rs index 0703da73ea..e6b72bcd0b 100644 --- a/pageserver/src/layered_repository.rs +++ b/pageserver/src/layered_repository.rs @@ -86,11 +86,6 @@ static ZERO_PAGE: Bytes = Bytes::from_static(&[0u8; 8192]); // Timeout when waiting for WAL receiver to catch up to an LSN given in a GetPage@LSN call. static TIMEOUT: Duration = Duration::from_secs(60); -// Taken from PG_CONTROL_MAX_SAFE_SIZE -const METADATA_MAX_SAFE_SIZE: usize = 512; -const METADATA_CHECKSUM_SIZE: usize = std::mem::size_of::(); -const METADATA_MAX_DATA_SIZE: usize = METADATA_MAX_SAFE_SIZE - METADATA_CHECKSUM_SIZE; - // Metrics collected on operations on the storage repository. lazy_static! { static ref STORAGE_TIME: HistogramVec = register_histogram_vec!( diff --git a/pageserver/src/layered_repository/metadata.rs b/pageserver/src/layered_repository/metadata.rs index 29f5fd5665..5c75ce5892 100644 --- a/pageserver/src/layered_repository/metadata.rs +++ b/pageserver/src/layered_repository/metadata.rs @@ -15,10 +15,12 @@ use zenith_utils::{ zid::{ZTenantId, ZTimelineId}, }; -use crate::{ - layered_repository::{METADATA_CHECKSUM_SIZE, METADATA_MAX_DATA_SIZE, METADATA_MAX_SAFE_SIZE}, - PageServerConf, -}; +use crate::PageServerConf; + +// Taken from PG_CONTROL_MAX_SAFE_SIZE +const METADATA_MAX_SAFE_SIZE: usize = 512; +const METADATA_CHECKSUM_SIZE: usize = std::mem::size_of::(); +const METADATA_MAX_DATA_SIZE: usize = METADATA_MAX_SAFE_SIZE - METADATA_CHECKSUM_SIZE; /// The name of the metadata file pageserver creates per timeline. pub const METADATA_FILE_NAME: &str = "metadata";