rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-10 23:12:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Downgrade a few panics into plain errors.

Browse Source 
Let's not bring down the whole pageserver if you import a bogus tar
archive to one timeline.
This commit is contained in:
Heikki Linnakangas
2022-08-27 18:14:35 +03:00
parent 34b5d7aa9f
commit f8188e679c
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pageserver/src/import_datadir.rs
View File

@@ -331,7 +331,11 @@ pub fn import_basebackup_from_tar<Reader: Read>(
debug!("directory {:?}", file_path);
}
_ => {
panic!("tar::EntryType::?? {}", file_path.display());
bail!(
"entry {} in backup tar archive is of unexpected type: {:?}",
file_path.display(),
header.entry_type()
);
}
}
}
@@ -384,7 +388,11 @@ pub fn import_wal_from_tar<Reader: Read>(
continue;
}
_ => {
panic!("tar::EntryType::?? {}", file_path.display());
bail!(
"entry {} in WAL tar archive is of unexpected type: {:?}",
file_path.display(),
header.entry_type()
);
}
}
};
@@ -424,14 +432,12 @@ pub fn import_wal_from_tar<Reader: Read>(
Ok(())
}
pub fn import_file<Reader: Read>(
fn import_file<Reader: Read>(
modification: &mut DatadirModification,
file_path: &Path,
reader: Reader,
len: usize,
) -> Result<Option<ControlFileData>> {
debug!("looking at {:?}", file_path);
if file_path.starts_with("global") {
let spcnode = pg_constants::GLOBALTABLESPACE_OID;
let dbnode = 0;
@@ -553,7 +559,10 @@ pub fn import_file<Reader: Read>(
// this to import arbitrary postgres databases.
bail!("Importing pg_tblspc is not implemented");
} else {
debug!("ignored");
debug!(
"ignoring unrecognized file \"{}\" in tar archive",
file_path.display()
);
}
Ok(None)