Skip to content

Run rate limiter garbage collection before inserting new user #866

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
tnull merged 1 commit into from
Apr 3, 2026
Merged

Run rate limiter garbage collection before inserting new user #866

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
22 changes: 14 additions & 8 deletions src/payment/asynchronous/rate_limiter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ pub(crate) struct RateLimiter {
max_idle: Duration,
}

const MAX_USERS: usize = 10_000;

struct Bucket {
tokens: u32,
last_refill: Instant,
Expand All @@ -36,10 +38,19 @@ impl RateLimiter {
pub(crate) fn allow(&mut self, user_id: &[u8]) -> bool {
let now = Instant::now();

let entry = self.users.entry(user_id.to_vec());
let is_new_user = matches!(entry, std::collections::hash_map::Entry::Vacant(_));
let is_new_user = !self.users.contains_key(user_id);

if is_new_user {
self.garbage_collect(self.max_idle);
if self.users.len() >= MAX_USERS {
return false;
}
}

let bucket = entry.or_insert(Bucket { tokens: self.capacity, last_refill: now });
let bucket = self
.users
.entry(user_id.to_vec())
.or_insert(Bucket { tokens: self.capacity, last_refill: now });

let elapsed = now.duration_since(bucket.last_refill);
let tokens_to_add = (elapsed.as_secs_f64() / self.refill_interval.as_secs_f64()) as u32;
Expand All @@ -56,11 +67,6 @@ impl RateLimiter {
false
};

// Each time a new user is added, we take the opportunity to clean up old rate limits.
if is_new_user {
self.garbage_collect(self.max_idle);
}

allow
}

Expand Down
Loading