From f03c14170d8500b96724c7273b7692c7e2d6a13f Mon Sep 17 00:00:00 2001
From: Bojan Serafimov <bojan.serafimov7@gmail.com>
Date: Thu, 9 Jun 2022 23:28:20 -0400
Subject: [PATCH] Fix bug. Should work now

---
 pageserver/src/import_datadir.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pageserver/src/import_datadir.rs b/pageserver/src/import_datadir.rs
index 8c6e0a4e15..083059cb7b 100644
--- a/pageserver/src/import_datadir.rs
+++ b/pageserver/src/import_datadir.rs
@@ -6,6 +6,7 @@ use std::fs;
 use std::fs::File;
 use std::io::{Read, Seek, SeekFrom};
 use std::path::{Path, PathBuf};
+use std::str::FromStr;
 
 use anyhow::{bail, ensure, Context, Result};
 use bytes::{Buf, Bytes};
@@ -438,7 +439,8 @@ pub fn import_timeline_from_tar<R: Repository, Reader: Read>(
 ) -> Result<()> {
     let mut ar = tar::Archive::new(reader);
 
-    let mut modification = tline.begin_modification(end_lsn);
+    // HACK
+    let mut modification = tline.begin_modification(Lsn::from_str("0/3000028")?);
     modification.init_empty()?;
 
     let mut entries_iter = ar.entries()?;
@@ -617,7 +619,7 @@ pub fn import_file<R: Repository>(
 
         import_slru(modification, slru, file_path, bytes.reader(), bytes_len)?;
         info!("imported clog slru");
-    } else if file_path.starts_with("pg_multixact/offset") {
+    } else if file_path.starts_with("pg_multixact/offsets") {
         let slru = SlruKind::MultiXactOffsets;
 
         import_slru(modification, slru, file_path, bytes.reader(), bytes_len)?;