rust/tantivy
1
0
Fork 0
mirror of https://github.com/quickwit-oss/tantivy.git synced 2026-01-04 16:22:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

(hopefully) bugfix race condition on wait merging threadwq.

Browse Source
This commit is contained in:
Paul Masurel
2017-03-24 17:42:24 +09:00
parent e75402be80
commit daa19b770a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/indexer/segment_updater.rs
View File

@@ -308,7 +308,7 @@ impl SegmentUpdater {
}
pub fn wait_merging_thread(&self) -> thread::Result<()> {
pub fn wait_merging_thread(&self) -> Result<()> {
let mut new_merging_threads = HashMap::new();
{
let mut merging_threads = self.0.merging_threads.write().unwrap();
@@ -317,9 +317,13 @@ impl SegmentUpdater {
for (_, merging_thread_handle) in new_merging_threads {
merging_thread_handle
.join()
.map(|_| ())?
.map(|_| ())
.map_err(|_| {
Error::ErrorInThread("Merging thread failed.".to_string())
})?
}
Ok(())
// Our merging thread may have queued their completed
self.run_async(move |_| {}).wait()
}
}