diff options
author | Quentin <quentin@deuxfleurs.fr> | 2020-11-19 14:39:30 +0100 |
---|---|---|
committer | Quentin <quentin@deuxfleurs.fr> | 2020-11-19 14:39:30 +0100 |
commit | fc427b0b66241785ecd3fe23ec3e4ac72aaed1da (patch) | |
tree | ea406de04a7a11c09c6d758ca97ba53fc2bdfbe4 /src/table | |
parent | 6076d869b14aa38059d54a2dece222ad7b9da3bc (diff) | |
parent | 044d7988779aadac9290b58ceb077c1211670aed (diff) | |
download | garage-fc427b0b66241785ecd3fe23ec3e4ac72aaed1da.tar.gz garage-fc427b0b66241785ecd3fe23ec3e4ac72aaed1da.zip |
Merge branch 'master' into feature/website
Diffstat (limited to 'src/table')
-rw-r--r-- | src/table/table.rs | 2 | ||||
-rw-r--r-- | src/table/table_sync.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/table/table.rs b/src/table/table.rs index 9d43a475..2beac3f4 100644 --- a/src/table/table.rs +++ b/src/table/table.rs @@ -329,7 +329,7 @@ where .await?; Ok(TableRPC::SyncRPC(response)) } - _ => Err(Error::BadRequest(format!("Unexpected table RPC"))), + _ => Err(Error::BadRPC(format!("Unexpected table RPC"))), } } diff --git a/src/table/table_sync.rs b/src/table/table_sync.rs index 145b3068..6c0df15b 100644 --- a/src/table/table_sync.rs +++ b/src/table/table_sync.rs @@ -474,7 +474,7 @@ where todo.push_back(root_ck); } } else { - return Err(Error::BadRequest(format!( + return Err(Error::Message(format!( "Invalid respone to GetRootChecksumRange RPC: {}", debug_serialize(root_cks_resp) ))); @@ -530,7 +530,7 @@ where self.send_items(who, items_to_send).await?; } } else { - return Err(Error::BadRequest(format!( + return Err(Error::Message(format!( "Unexpected response to sync RPC checksums: {}", debug_serialize(&rpc_resp) ))); |