oomd: Return tristate status from oomd_cgroup_kill_mark()
oomd_cgroup_kill_mark() currently returns 0 on all non-error paths. But the manager only logs that it marked for killing on `if (r > 0)`, which is thus unreachable. Changing it to `r >= 0` would also be wrong, because then we would log on no-op paths. So let's fix this by making the return value express what actually happened: - < 0: failure to queue the kill state - 0: no new mark was created (already queued or dry-run) - > 0: a new kill state was queued
This commit is contained in:
@@ -541,9 +541,8 @@ static int monitor_memory_pressure_contexts_handler(sd_event_source *s, uint64_t
|
||||
log_error_errno(r, "Failed to select any cgroups under %s based on pressure, ignoring: %m", t->path);
|
||||
else {
|
||||
/* Don't act on all the high pressure cgroups at once; return as soon as we kill one.
|
||||
* If r == 0 then it means there were not eligible candidates, the candidate cgroup
|
||||
* disappeared, or the candidate cgroup has no processes by the time we tried to kill
|
||||
* it. In either case, go through the event loop again and select a new candidate if
|
||||
* If r == 0 then the cgroup is already queued for kill by an earlier iteration.
|
||||
* In either case, go through the event loop again and select a new candidate if
|
||||
* pressure is still high. */
|
||||
m->mem_pressure_post_action_delay_start = usec_now;
|
||||
if (selected && r > 0) {
|
||||
|
||||
+1
-1
@@ -507,7 +507,7 @@ int oomd_cgroup_kill_mark(Manager *m, OomdCGroupContext *ctx) {
|
||||
if (r < 0)
|
||||
log_warning_errno(r, "oomd prekill hook failed for %s, ignoring: %m", ctx->path);
|
||||
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
typedef void (*dump_candidate_func)(const OomdCGroupContext *ctx, FILE *f, const char *prefix);
|
||||
|
||||
Reference in New Issue
Block a user