From 2283eb871aa90d17b4f378e1fa65224c1fc68c9c Mon Sep 17 00:00:00 2001 From: Bojan Serafimov Date: Sun, 12 Jun 2022 10:05:28 -0400 Subject: [PATCH] Add assertion --- pageserver/src/import_datadir.rs | 5 ++++- pageserver/src/page_service.rs | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pageserver/src/import_datadir.rs b/pageserver/src/import_datadir.rs index 15b10e3e0b..67cbfe3e59 100644 --- a/pageserver/src/import_datadir.rs +++ b/pageserver/src/import_datadir.rs @@ -495,7 +495,10 @@ pub fn import_wal_from_tar( match header.entry_type() { tar::EntryType::Regular => { - // TODO assert filename matches segno + // FIXME: assume postgresql tli 1 for now + let expected_filename = XLogFileName(1, segno, pg_constants::WAL_SEGMENT_SIZE); + let file_name = file_path.file_name().unwrap().to_string_lossy(); + ensure!(expected_filename == file_name); info!("processing wal file {:?}", file_path); read_all_bytes(entry)? diff --git a/pageserver/src/page_service.rs b/pageserver/src/page_service.rs index 2c439f3589..ef125df4c4 100644 --- a/pageserver/src/page_service.rs +++ b/pageserver/src/page_service.rs @@ -577,6 +577,8 @@ impl PageServerHandler { let mut datadir_timeline = DatadirTimeline::::new( timeline, repartition_distance); + // TODO ensure start_lsn matches current lsn + // Import wal provided via CopyData info!("importing wal"); pgb.write_message(&BeMessage::CopyInResponse)?;