snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-11-04 01:46:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure to avoid removing the first pending update as it is processed

Browse Source
This commit is contained in:
Kerollmops
2020-11-29 21:13:50 +01:00
parent 96f64c629e
commit 878b1873cd
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/update_store.rs
View File

@@ -238,7 +238,7 @@ impl<M: 'static, N: 'static> UpdateStore<M, N> {
let key = BEU64::new(update_id);
// We cannot abort an update that is currently being processed.
if self.processing_update_id() == Some(update_id) {
if self.pending_meta.first(&wtxn)?.map(|(key, _)| key.get()) == Some(update_id) {
return Ok(None);
}
@@ -262,15 +262,12 @@ impl<M: 'static, N: 'static> UpdateStore<M, N> {
where M: Serialize + for<'a> Deserialize<'a>,
{
let mut wtxn = self.env.write_txn()?;
let processing_update_id = self.processing_update_id();
let mut aborted_updates = Vec::new();
for result in self.pending_meta.iter(&wtxn)? {
// We skip the first pending update as it is currently being processed.
for result in self.pending_meta.iter(&wtxn)?.skip(1) {
let (key, meta) = result?;
let id = key.get();
if processing_update_id == Some(id) {
continue;
}
aborted_updates.push((id, meta));
}