grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixing high CPU usage on federation worker recheck. Fixes #3958

Browse source
This commit is contained in:
Dessalines 2023-09-12 15:54:49 -04:00
parent 6735a98d35
commit 4f1240487e
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/federate/src/worker.rs
View file

@ -32,10 +32,10 @@ static WORK_FINISHED_RECHECK_DELAY: Duration = Duration::from_secs(1);
static WORK_FINISHED_RECHECK_DELAY: Duration = Duration::from_secs(30);
#[cfg(debug_assertions)]
static FOLLOW_ADDITIONS_RECHECK_DELAY: Lazy<chrono::Duration> =
Lazy::new(|| chrono::Duration::seconds(1));
Lazy::new(|| chrono::Duration::minutes(1));
#[cfg(not(debug_assertions))]
static FOLLOW_ADDITIONS_RECHECK_DELAY: Lazy<chrono::Duration> =
Lazy::new(|| chrono::Duration::minutes(1));
Lazy::new(|| chrono::Duration::minutes(5));
static FOLLOW_REMOVALS_RECHECK_DELAY: Lazy<chrono::Duration> =
Lazy::new(|| chrono::Duration::hours(1));
pub(crate) struct InstanceWorker {
@ -254,7 +254,8 @@ impl InstanceWorker {
.send_inboxes
.iter()
.filter_map(std::option::Option::as_ref)
.filter_map(|u| (u.domain() == Some(&self.instance.domain)).then(|| u.inner().clone())),
.filter(|&u| (u.domain() == Some(&self.instance.domain)))
.map(|u| u.inner().clone()),
);
Ok(inbox_urls)
}
@ -295,7 +296,7 @@ impl InstanceWorker {
.await?
.into_iter()
.fold(HashMap::new(), |mut map, (c, u)| {
map.entry(c).or_insert_with(HashSet::new).insert(u.into());
map.entry(c).or_default().insert(u.into());
map
}),
new_last_fetch,

2
migrations/2023-09-12-194850_add_federation_worker_index/down.sql Normal file
View file

@ -0,0 +1,2 @@
DROP INDEX idx_person_local_instance;

2
migrations/2023-09-12-194850_add_federation_worker_index/up.sql Normal file
View file

@ -0,0 +1,2 @@
CREATE INDEX idx_person_local_instance ON person (local DESC, instance_id);