public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Florian Weimer <fw@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/tmp] nscd: Skip unusable entries in first pass in prune_cache (bug 30800) Date: Tue, 29 Aug 2023 07:26:45 +0000 (GMT) [thread overview] Message-ID: <20230829072645.D3CCB3856090@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c00b984fcd53f679ca2dafcd1aee2c89836e6e73 commit c00b984fcd53f679ca2dafcd1aee2c89836e6e73 Author: Florian Weimer <fweimer@redhat.com> Date: Tue Aug 29 08:28:31 2023 +0200 nscd: Skip unusable entries in first pass in prune_cache (bug 30800) Previously, if an entry was marked unusable for any reason, but had not timed out yet, the assert would trigger. One way to get into such state is if a data change is detected during re-validation of an entry. This causes the entry to be marked as not usable. If exits nscd soon after that, then the clock jumps backwards, and nscd restarted, the cache re-validation run after startup triggers the removed assert. The change is more complicated than just the removal of the assert because entries marked as not usable should be garbage-collected in the second pass. To make this happen, it is necessary to update some book-keeping data. Reviewed-by: DJ Delorie <dj@redhat.com> Diff: --- nscd/cache.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/nscd/cache.c b/nscd/cache.c index b4b54d82bb..336ff548cb 100644 --- a/nscd/cache.c +++ b/nscd/cache.c @@ -370,8 +370,11 @@ prune_cache (struct database_dyn *table, time_t now, int fd) serv2str[runp->type], str, dh->timeout); } - /* Check whether the entry timed out. */ - if (dh->timeout < now) + /* Check whether the entry timed out. Timed out entries + will be revalidated. For unusable records, it is still + necessary to record that the bucket needs to be scanned + again below. */ + if (dh->timeout < now || !dh->usable) { /* This hash bucket could contain entries which need to be looked at. */ @@ -383,7 +386,7 @@ prune_cache (struct database_dyn *table, time_t now, int fd) /* We only have to look at the data of the first entries since the count information is kept in the data part which is shared. */ - if (runp->first) + if (runp->first && dh->usable) { /* At this point there are two choices: we reload the @@ -399,9 +402,6 @@ prune_cache (struct database_dyn *table, time_t now, int fd) { /* Remove the value. */ dh->usable = false; - - /* We definitely have some garbage entries now. */ - any = true; } else { @@ -413,18 +413,15 @@ prune_cache (struct database_dyn *table, time_t now, int fd) time_t timeout = readdfcts[runp->type] (table, runp, dh); next_timeout = MIN (next_timeout, timeout); - - /* If the entry has been replaced, we might need - cleanup. */ - any |= !dh->usable; } } + + /* If the entry has been replaced, we might need cleanup. */ + any |= !dh->usable; } else - { - assert (dh->usable); - next_timeout = MIN (next_timeout, dh->timeout); - } + /* Entry has not timed out and is usable. */ + next_timeout = MIN (next_timeout, dh->timeout); run = runp->next; }
reply other threads:[~2023-08-29 7:26 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230829072645.D3CCB3856090@sourceware.org \ --to=fw@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).