Skip to content

Commit

Permalink
better handling of non existent versions
Browse files Browse the repository at this point in the history
  • Loading branch information
pigmej committed Oct 14, 2024
1 parent f313633 commit e675e7e
Showing 1 changed file with 46 additions and 4 deletions.
50 changes: 46 additions & 4 deletions src/partial_quicksync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ fn find_restore_points(layer_from: u32, metadata: &str, jump_back: usize) -> Vec
let mut target_index = None;

for (index, line) in metadata.trim().lines().enumerate() {
let point = RestorePoint::from_str(line.trim()).expect("parsing restore point");
let point: RestorePoint = RestorePoint::from_str(line.trim()).expect("parsing restore point");
if (point.from..point.to).contains(&layer_from) && target_index.is_none() {
target_index = Some(index);
}
Expand Down Expand Up @@ -160,15 +160,30 @@ pub fn partial_restore(
let client = Client::new();
let conn = Connection::open(target_db_path)?;
let user_version = get_user_version(&conn)?;
let remote_metadata = client
let response = client
.get(format!(
"{}/{}/metadata.csv?version={}",
base_url,
user_version,
env!("CARGO_PKG_VERSION")
))
.send()?
.text()?;
.send()
.context(format!(
"Failed to fetch remote metadata.csv for user_version={}",
user_version
))?;

if response.status() == reqwest::StatusCode::NOT_FOUND {
anyhow::bail!(
"Remote server returned 404 for metadata.csv. User version {} might not exist.",
user_version
);
}

let remote_metadata = response.text().context(format!(
"Failed to read remote metadata.csv for user_version={}",
user_version
))?;

let latest_layer = get_latest_from_db(&conn)?;
let layer_from = (latest_layer + 1).saturating_sub(untrusted_layers);
Expand Down Expand Up @@ -206,6 +221,7 @@ pub fn partial_restore(
// does not DETACH it because it causes problems.
let conn = Connection::open(target_db_path)?;
if p.from != 0 {
println!("Checking hash for restore point {p:?}");
let previous_hash = get_previous_hash(p.from, &conn)?;
anyhow::ensure!(
previous_hash == p.hash[..4],
Expand Down Expand Up @@ -636,4 +652,30 @@ mod tests {
.contains("No suitable restore points found, seems that state.sql is too old"));
mock_metadata.assert();
}

#[test]
fn non_existing_version() {
let dir = tempdir().unwrap();
let db_path = dir.path().join("state.db");
{
let conn = create_test_db(Some(&db_path));
insert_layer(&conn, 80, 100, &[0xFF, 0xFF]);
}
let mut server = mockito::Server::new();

let mock_metadata = server
.mock("GET", "/15/metadata.csv")
.match_query(Matcher::UrlEncoded(
"version".into(),
env!("CARGO_PKG_VERSION").into(),
))
.with_status(404)
.create();
let err = super::partial_restore(&server.url(), &db_path, dir.path(), 0, 0).unwrap_err();
println!("{}", err);
assert!(err
.to_string()
.contains("Remote server returned 404 for metadata.csv. User version 15 might not exist."));
mock_metadata.assert();
}
}

0 comments on commit e675e7e

Please sign in to comment.