Skip to content

Fix #11572: Fix Solr updater cache clearing performance bug #11595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bettercallok wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #11572: Fix Solr updater cache clearing performance bug #11595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions openlibrary/solr/data_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,16 @@ def preload_editions_of_works(self, work_keys: Iterable[str]):

def clear_cache(self):
super().clear_cache()
# Log cache statistics to monitor effectiveness and validate the fix
if self.cache or self.ia_cache or self.edition_keys_of_works_cache:
logger.debug(
"Cache stats before clearing - documents: %d, IA metadata: %d, "
"work→editions: %d, redirects: %d",
len(self.cache),
len(self.ia_cache),
len(self.edition_keys_of_works_cache),
len(self.redirect_cache),
)
self.cache.clear()
self.redirect_cache.clear()
self.edition_keys_of_works_cache.clear()
8 changes: 6 additions & 2 deletions scripts/solr_updater/solr_updater.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,8 @@ async def update_keys(keys):
count += len(chunk)
await update.do_updates(chunk)

# Caches should not persist between different calls to update_keys!
update.data_provider.clear_cache()
# Cache is now cleared after each iteration in main(), not after each batch
# This allows cache reuse within a single call to update_keys()

if count:
logger.info("updated %d documents", count)
Expand Down Expand Up @@ -300,6 +300,10 @@ async def main(
keys = parse_log(records, load_ia_scans)
count = await update_keys(keys)

# Clear cache after processing all keys from this iteration
# This prevents unbounded cache growth while allowing cache reuse within update_keys()
update.data_provider.clear_cache()

if logfile.tell() != offset:
offset = logfile.tell()
logger.info("saving offset %s", offset)
Expand Down