From 92031d376af9c8d80e77ee33afdb9b7868281f9c Mon Sep 17 00:00:00 2001 From: Konstantin Knizhnik Date: Thu, 31 Mar 2022 16:44:01 +0300 Subject: [PATCH] Fix unit tests --- pageserver/src/layered_repository.rs | 6 ++++-- pageserver/src/timelines.rs | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pageserver/src/layered_repository.rs b/pageserver/src/layered_repository.rs index a63f157552..eb4f49ddd1 100644 --- a/pageserver/src/layered_repository.rs +++ b/pageserver/src/layered_repository.rs @@ -1590,8 +1590,10 @@ impl LayeredTimeline { let target_file_size = self.conf.checkpoint_distance; // Define partitioning schema if needed - tenant_mgr::get_timeline_for_tenant_load(self.tenantid, self.timelineid)? - .repartition(self.get_last_record_lsn())?; + if let Ok(pgdir) = tenant_mgr::get_timeline_for_tenant_load(self.tenantid, self.timelineid) + { + pgdir.repartition(self.get_last_record_lsn())?; + } // 1. The partitioning was already done by the code in // pgdatadir_mapping.rs. We just use it here. diff --git a/pageserver/src/timelines.rs b/pageserver/src/timelines.rs index ae713c260c..105c3c869f 100644 --- a/pageserver/src/timelines.rs +++ b/pageserver/src/timelines.rs @@ -286,7 +286,7 @@ fn bootstrap_timeline( let timeline = repo.create_empty_timeline(tli, lsn)?; let mut page_tline: DatadirTimeline = DatadirTimeline::new(timeline, u64::MAX); import_datadir::import_timeline_from_postgres_datadir(&pgdata_path, &mut page_tline, lsn)?; - page_tline.tline.checkpoint(CheckpointConfig::Flush)?; + page_tline.tline.checkpoint(CheckpointConfig::Forced)?; println!( "created initial timeline {} timeline.lsn {}",