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

refactor: Result<(), NeedsDownload>

Browse Source
This commit is contained in:
Joonas Koivunen
2023-08-28 16:53:32 +03:00
parent df328758f0
commit 55105ad1c3
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pageserver/src/tenant/storage_layer/layer.rs
View File

@@ -755,7 +755,7 @@ impl LayerInner {
async fn needs_download(&self) -> Result<Option<NeedsDownload>, std::io::Error> {
match tokio::fs::metadata(&self.path).await {
Ok(m) => Ok(self.is_file_present_and_good_size(&m)),
Ok(m) => Ok(self.is_file_present_and_good_size(&m).err()),
Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok(Some(NeedsDownload::NotFound)),
Err(e) => Err(e),
}
@@ -763,24 +763,23 @@ impl LayerInner {
fn needs_download_blocking(&self) -> Result<Option<NeedsDownload>, std::io::Error> {
match self.path.metadata() {
Ok(m) => Ok(self.is_file_present_and_good_size(&m)),
Ok(m) => Ok(self.is_file_present_and_good_size(&m).err()),
Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok(Some(NeedsDownload::NotFound)),
Err(e) => Err(e),
}
}
fn is_file_present_and_good_size(&self, m: &std::fs::Metadata) -> Option<NeedsDownload> {
// in future, this should include sha2-256 the file, hopefully rarely, because info uses
// this as well
fn is_file_present_and_good_size(&self, m: &std::fs::Metadata) -> Result<(), NeedsDownload> {
// in future, this should include sha2-256 the file.
if !m.is_file() {
Some(NeedsDownload::NotFile)
Err(NeedsDownload::NotFile)
} else if m.len() != self.desc.file_size {
Some(NeedsDownload::WrongSize {
Err(NeedsDownload::WrongSize {
actual: m.len(),
expected: self.desc.file_size,
})
} else {
None
Ok(())
}
}