sij/khoj
1
0
Fork 0
mirror of https://github.com/khoj-ai/khoj.git synced 2024-11-27 17:35:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Release lock after updating index even if update fails to prevent deadlock

Browse source 
Wrap acquire/release locks in try/catch/finally when updating content
index and search models to prevent lock not being released on error
and causing a deadlock
This commit is contained in:
Debanjum Singh Solanky 2023-07-14 16:57:27 -07:00
parent b9fb656657
commit f08e9539f1
1 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/khoj/configure.py
View file

@ -56,18 +56,26 @@ def configure_server(args, required=False):
state.processor_config = configure_processor(args.config.processor) state.processor_config = configure_processor(args.config.processor)
# Initialize Search Models from Config # Initialize Search Models from Config
state.search_index_lock.acquire() try:
state.SearchType = configure_search_types(state.config) state.search_index_lock.acquire()
state.search_models = configure_search(state.search_models, state.config.search_type) state.SearchType = configure_search_types(state.config)
state.search_index_lock.release() state.search_models = configure_search(state.search_models, state.config.search_type)
except Exception as e:
logger.error(f"🚨 Error configuring search models on app load: {e}")
finally:
state.search_index_lock.release()
# Initialize Content from Config # Initialize Content from Config
if state.search_models: if state.search_models:
state.search_index_lock.acquire() try:
state.content_index = configure_content( state.search_index_lock.acquire()
state.content_index, state.config.content_type, state.search_models, args.regenerate state.content_index = configure_content(
) state.content_index, state.config.content_type, state.search_models, args.regenerate
state.search_index_lock.release() )
except Exception as e:
logger.error(f"🚨 Error configuring content index on app load: {e}")
finally:
state.search_index_lock.release()
def configure_routes(app): def configure_routes(app):
@ -86,12 +94,16 @@ if not state.demo:
@schedule.repeat(schedule.every(61).minutes) @schedule.repeat(schedule.every(61).minutes)
def update_search_index(): def update_search_index():
state.search_index_lock.acquire() try:
state.content_index = configure_content( state.search_index_lock.acquire()
state.content_index, state.config.content_type, state.search_models, regenerate=False state.content_index = configure_content(
) state.content_index, state.config.content_type, state.search_models, regenerate=False
state.search_index_lock.release() )
logger.info("📬 Search index updated via Scheduler") logger.info("📬 Content index updated via Scheduler")
except Exception as e:
logger.error(f"🚨 Error updating content index via Scheduler: {e}")
finally:
state.search_index_lock.release()
def configure_search_types(config: FullConfig): def configure_search_types(config: FullConfig):