snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-07-27 00:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Retry in case of timeout while reopening

Browse Source
This commit is contained in:
Louis Dureuil
2023-02-09 11:54:35 +01:00
parent b07614932e
commit d3920a7e8a
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
index-scheduler/src/index_mapper.rs
View File

@ -116,13 +116,12 @@ mod index_map {
/// After the index is physically closed, the in memory map must still be updated to take this into account. /// After the index is physically closed, the in memory map must still be updated to take this into account.
/// To do so, a `ReopenableIndex` is returned, that can be used to either definitely close or definitely open /// To do so, a `ReopenableIndex` is returned, that can be used to either definitely close or definitely open
/// the index without waiting anymore. /// the index without waiting anymore.
pub fn wait_timeout(self, timeout: Duration) -> ReopenableIndex { pub fn wait_timeout(self, timeout: Duration) -> Option<ReopenableIndex> {
self.closing_event.wait_timeout(timeout); self.closing_event.wait_timeout(timeout).then_some(ReopenableIndex {
ReopenableIndex {
uuid: self.uuid, uuid: self.uuid,
map_size: self.map_size, map_size: self.map_size,
generation: self.generation, generation: self.generation,
} })
} }
} }
@ -505,7 +504,11 @@ impl IndexMapper {
if tries >= 100 { if tries >= 100 {
panic!("Too many attempts to close index {name} prior to deletion.") panic!("Too many attempts to close index {name} prior to deletion.")
} }
let reopen = reopen.wait_timeout(Duration::from_secs(6)); let reopen = if let Some(reopen) = reopen.wait_timeout(Duration::from_secs(6)) {
reopen
} else {
continue;
};
reopen.close(&mut self.index_map.write().unwrap()); reopen.close(&mut self.index_map.write().unwrap());
continue; continue;
} }
@ -585,7 +588,11 @@ impl IndexMapper {
Available(index) => break index, Available(index) => break index,
Closing(reopen) => { Closing(reopen) => {
// Avoiding deadlocks: no lock taken while doing this operation. // Avoiding deadlocks: no lock taken while doing this operation.
let reopen = reopen.wait_timeout(Duration::from_secs(6)); let reopen = if let Some(reopen) = reopen.wait_timeout(Duration::from_secs(6)) {
reopen
} else {
continue;
};
let index_path = self.base_path.join(uuid.to_string()); let index_path = self.base_path.join(uuid.to_string());
// take the lock to reopen the environment. // take the lock to reopen the environment.
reopen.reopen(&mut self.index_map.write().unwrap(), &index_path)?; reopen.reopen(&mut self.index_map.write().unwrap(), &index_path)?;