diff --git a/pageserver/src/http/models.rs b/pageserver/src/http/models.rs index 232c202ed9..654f45a95d 100644 --- a/pageserver/src/http/models.rs +++ b/pageserver/src/http/models.rs @@ -150,6 +150,9 @@ pub struct RemoteTimelineInfo { pub awaits_download: bool, } +/// +/// This represents the output of the "timeline_detail" API call. +/// #[serde_as] #[derive(Debug, Serialize, Deserialize, Clone)] pub struct TimelineInfo { diff --git a/pageserver/src/layered_repository.rs b/pageserver/src/layered_repository.rs index dd173498b9..0bfa1cd268 100644 --- a/pageserver/src/layered_repository.rs +++ b/pageserver/src/layered_repository.rs @@ -656,9 +656,9 @@ impl Repository { /// Locate and load config pub fn load_tenant_config( conf: &'static PageServerConf, - tenantid: ZTenantId, + tenant_id: ZTenantId, ) -> anyhow::Result { - let target_config_path = TenantConf::path(conf, tenantid); + let target_config_path = TenantConf::path(conf, tenant_id); info!("load tenantconf from {}", target_config_path.display()); @@ -693,11 +693,11 @@ impl Repository { pub fn persist_tenant_config( conf: &'static PageServerConf, - tenantid: ZTenantId, + tenant_id: ZTenantId, tenant_conf: TenantConfOpt, ) -> anyhow::Result<()> { let _enter = info_span!("saving tenantconf").entered(); - let target_config_path = TenantConf::path(conf, tenantid); + let target_config_path = TenantConf::path(conf, tenant_id); info!("save tenantconf to {}", target_config_path.display()); let mut conf_content = r#"# This file contains a specific per-tenant's config. @@ -834,7 +834,7 @@ impl Repository { // compaction (both require `layer_removal_cs` lock), // but the GC iteration can run concurrently with branch creation. // - // See comments in [`LayeredRepository::branch_timeline`] for more information + // See comments in [`Repository::branch_timeline`] for more information // about why branch creation task can run concurrently with timeline's GC iteration. for timeline in gc_timelines { if thread_mgr::is_shutdown_requested() { diff --git a/pageserver/src/layered_repository/timeline.rs b/pageserver/src/layered_repository/timeline.rs index fb5a4d0b83..a909dcb5a1 100644 --- a/pageserver/src/layered_repository/timeline.rs +++ b/pageserver/src/layered_repository/timeline.rs @@ -354,8 +354,8 @@ pub struct Timeline { upload_layers: AtomicBool, /// Ensures layers aren't frozen by checkpointer between - /// [`LayeredTimeline::get_layer_for_write`] and layer reads. - /// Locked automatically by [`LayeredTimelineWriter`] and checkpointer. + /// [`Timeline::get_layer_for_write`] and layer reads. + /// Locked automatically by [`TimelineWriter`] and checkpointer. /// Must always be acquired before the layer map/individual layer lock /// to avoid deadlock. write_lock: Mutex<()>, @@ -365,7 +365,7 @@ pub struct Timeline { /// Layer removal lock. /// A lock to ensure that no layer of the timeline is removed concurrently by other threads. - /// This lock is acquired in [`LayeredTimeline::gc`], [`LayeredTimeline::compact`], + /// This lock is acquired in [`Timeline::gc`], [`Timeline::compact`], /// and [`LayeredRepository::delete_timeline`]. layer_removal_cs: Mutex<()>, diff --git a/pageserver/src/page_service.rs b/pageserver/src/page_service.rs index e6114c0fc5..c21d5a6acc 100644 --- a/pageserver/src/page_service.rs +++ b/pageserver/src/page_service.rs @@ -744,7 +744,7 @@ impl PageServerHandler { let latest_gc_cutoff_lsn = timeline.get_latest_gc_cutoff_lsn(); let lsn = Self::wait_or_get_last_lsn(timeline, req.lsn, req.latest, &latest_gc_cutoff_lsn)?; /* - // Add a 1s delay to some requests. The delayed causes the requests to + // Add a 1s delay to some requests. The delay helps the requests to // hit the race condition from github issue #1047 more easily. use rand::Rng; if rand::thread_rng().gen::() < 5 {