rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-05-27 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

wal_service: permit I/O errors while reading control file

Browse Source 
I'm not sure why ignoring this error is a good idea, but the
test_embedded_wal_proposer test fails if we propagate the error upward.
This commit is contained in:
Eric Seppanen
2021-05-18 16:43:27 -07:00
committed by Eric Seppanen
parent 2148ae78ab
commit 3296b7d770
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
walkeeper/src/wal_service.rs
View File

@@ -189,19 +189,24 @@ impl SharedState {
self.control_file = Some(file);
let cfile_ref = self.control_file.as_mut().unwrap();
let my_info = SafeKeeperInfo::des_from(cfile_ref)?;
if my_info.magic != SK_MAGIC {
bail!("Invalid control file magic: {}", my_info.magic);
match SafeKeeperInfo::des_from(cfile_ref) {
Err(e) => {
warn!("read from {:?} failed: {}", control_file_path, e);
}
Ok(info) => {
if info.magic != SK_MAGIC {
bail!("Invalid control file magic: {}", info.magic);
}
if info.format_version != SK_FORMAT_VERSION {
bail!(
"Incompatible format version: {} vs. {}",
info.format_version,
SK_FORMAT_VERSION
);
}
self.info = info;
}
}
if my_info.format_version != SK_FORMAT_VERSION {
bail!(
"Incompatible format version: {} vs. {}",
my_info.format_version,
SK_FORMAT_VERSION
);
}
self.info = my_info;
}
Err(e) => {
panic!(