Skip to content

cache: fix cyclic ABSL_ACQUIRED_BEFORE annotations in CacheEvictionThread #46043

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

Merged
jwendell merged 1 commit into from
Jul 9, 2026
Merged

cache: fix cyclic ABSL_ACQUIRED_BEFORE annotations in CacheEvictionThread #46043

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
7 changes: 3 additions & 4 deletions source/extensions/http/cache/file_system_http_cache/cache_eviction_thread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,12 @@ class CacheEvictionThread final : public Logger::Loggable<Logger::Id::cache_filt
*/
void terminate();

// These two mutexes are never held at the same time. We signify this by requiring
// that both be 'acquired before' the other, since there is no exclusion annotation.
absl::Mutex mu_ ABSL_ACQUIRED_BEFORE(cache_mu_);
// These two mutexes are never held at the same time; no ordering annotation is needed.
absl::Mutex mu_;
bool signalled_ ABSL_GUARDED_BY(mu_) = false;
bool terminating_ ABSL_GUARDED_BY(mu_) = false;

absl::Mutex cache_mu_ ABSL_ACQUIRED_BEFORE(mu_);
absl::Mutex cache_mu_;
// We must store the caches as unowned references so they can be destroyed
// during config changes - that destruction is the only signal that a cache
// instance should be removed.
Expand Down
Loading