searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-05-29 08:58:02 +02:00
Code Issues Releases Wiki Activity

remove file if write to update file fails

Browse Source
This commit is contained in:
marin postma 2021-06-23 14:45:26 +02:00
parent f62779671b
commit b000ae7614
No known key found for this signature in database
GPG Key ID: 6088B7721C3E39F9
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
meilisearch-http/src/index_controller/update_actor/actor.rs
View File

@ -122,7 +122,7 @@ where
&self,
uuid: Uuid,
meta: UpdateMeta,
mut payload: mpsc::Receiver<PayloadData<D>>,
payload: mpsc::Receiver<PayloadData<D>>,
) -> Result<UpdateStatus> {
let file_path = match meta {
UpdateMeta::DocumentsAddition { .. } => {
@ -137,21 +137,35 @@ where
.open(&path)
.await?;
let mut file_len = 0;
while let Some(bytes) = payload.recv().await {
let bytes = bytes?;
file_len += bytes.as_ref().len();
file.write_all(bytes.as_ref()).await?;
async fn write_to_file<D>(file: &mut fs::File, mut payload: mpsc::Receiver<PayloadData<D>>) -> Result<usize>
where
D: AsRef<[u8]> + Sized + 'static,
{
let mut file_len = 0;
while let Some(bytes) = payload.recv().await {
let bytes = bytes?;
file_len += bytes.as_ref().len();
file.write_all(bytes.as_ref()).await?;
}
Ok(file_len)
}
if file_len != 0 {
file.flush().await?;
let file = file.into_std().await;
Some((file, update_file_id))
} else {
// empty update, delete the empty file.
fs::remove_file(&path).await?;
None
let file_len = write_to_file(&mut file, payload).await;
match file_len {
Ok(len) if len > 0 => {
file.flush().await?;
let file = file.into_std().await;
Some((file, update_file_id))
}
Err(e) => {
fs::remove_file(&path).await?;
return Err(e)
}
_ => {
fs::remove_file(&path).await?;
None
}
}
}
_ => None,