From 50fe0594d22ec3fbc62276e4367672f860ac9abe Mon Sep 17 00:00:00 2001 From: Anita Zhang Date: Tue, 6 Jul 2021 02:46:13 -0700 Subject: [PATCH] oomd: don't collect candidate stats on every interval cb13961ada52c1b27f6d6c2c6e37a2901f01ed30 updated the oomd logic to collect candidate data when a kill was about to happen. However there was still a call left over in the main loop to collect candidate data on every interval. Remove this since it's unneeded. Fixes #20122 (cherry picked from commit d61ee727f037ab4e07af720ab34055e9cafe9cec) --- src/oom/oomd-manager.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/oom/oomd-manager.c b/src/oom/oomd-manager.c index ca319f4b0d..9cae0c9c8a 100644 --- a/src/oom/oomd-manager.c +++ b/src/oom/oomd-manager.c @@ -424,13 +424,6 @@ static int monitor_memory_pressure_contexts_handler(sd_event_source *s, uint64_t if (r < 0) log_debug_errno(r, "Failed to update monitored memory pressure cgroup contexts, ignoring: %m"); - r = update_monitored_cgroup_contexts_candidates( - m->monitored_mem_pressure_cgroup_contexts, &m->monitored_mem_pressure_cgroup_contexts_candidates); - if (r == -ENOMEM) - return log_oom(); - if (r < 0) - log_debug_errno(r, "Failed to update monitored memory pressure candidate cgroup contexts, ignoring: %m"); - /* Since pressure counters are lagging, we need to wait a bit after a kill to ensure we don't read stale * values and go on a kill storm. */ if (m->mem_pressure_post_action_delay_start > 0) { -- 2.25.1