Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix inner fts dispatch loop not quitting on shutdown when processing dirty books that have not actually changed

Browse Source
This commit is contained in:
Kovid Goyal 2022-08-06 13:09:41 +05:30
parent 83287ba398
commit 86d180be4c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/calibre/db/cache.py
View File

@ -445,8 +445,10 @@ class Cache:
return fts return fts
def start_fts_pool(self): def start_fts_pool(self):
from threading import Thread from threading import Thread, Event
self.fts_queue_thread = Thread(name='FTSQueue', target=Cache.dispatch_fts_jobs, args=(self.fts_job_queue, weakref.ref(self)), daemon=True) self.fts_dispatch_stop_event = Event()
self.fts_queue_thread = Thread(name='FTSQueue', target=Cache.dispatch_fts_jobs, args=(
self.fts_job_queue, self.fts_dispatch_stop_event, weakref.ref(self)), daemon=True)
self.fts_queue_thread.start() self.fts_queue_thread.start()
self.backend.fts.pool.initialize() self.backend.fts.pool.initialize()
self.backend.fts.pool.initialized.wait() self.backend.fts.pool.initialized.wait()
@ -489,7 +491,7 @@ class Cache:
self.backend.fts_unindex(book_id, fmt=fmt) self.backend.fts_unindex(book_id, fmt=fmt)
@staticmethod @staticmethod
def dispatch_fts_jobs(queue, dbref): def dispatch_fts_jobs(queue, stop_dispatch, dbref):
from .fts.text import is_fmt_ok from .fts.text import is_fmt_ok
def do_one(): def do_one():
@ -521,7 +523,7 @@ class Cache:
pt.write(chunk) pt.write(chunk)
with self.write_lock: with self.write_lock:
queued = self.backend.queue_fts_job(book_id, fmt, pt.name, sz, h.hexdigest()) queued = self.backend.queue_fts_job(book_id, fmt, pt.name, sz, h.hexdigest())
if not queued: # means a dirtied book was removed if not queued: # means a dirtied book was removed from the dirty list because the text has not changed
self._update_fts_indexing_numbers() self._update_fts_indexing_numbers()
return self.backend.fts_has_idle_workers return self.backend.fts_has_idle_workers
@ -530,7 +532,7 @@ class Cache:
if not self or not self.backend.fts_enabled: if not self or not self.backend.fts_enabled:
return return
has_more = True has_more = True
while has_more and not self.shutting_down and self.backend.fts_enabled: while has_more and not self.shutting_down and self.backend.fts_enabled and not stop_dispatch.is_set():
try: try:
has_more = do_one() has_more = do_one()
except Exception: except Exception:
@ -2446,6 +2448,8 @@ class Cache:
self.backend.shutdown_fts() self.backend.shutdown_fts()
if self.fts_queue_thread is not None: if self.fts_queue_thread is not None:
self.fts_job_queue.put(None) self.fts_job_queue.put(None)
if hasattr(self, 'fts_dispatch_stop_event'):
self.fts_dispatch_stop_event.set()
return return
# the fts supervisor thread could be in the middle of committing a # the fts supervisor thread could be in the middle of committing a
# result to the db, so holding a lock here will cause a deadlock # result to the db, so holding a lock here will cause a deadlock