shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-31 21:18:09 +03:00
Code

core: downgrade CPUQuotaPeriodSec= clamping logs to debug

Browse Source 
After the first warning log, further messages are downgraded to LOG_DEBUG.
This commit is contained in:
Filipe Brandenburger 2019-01-23 20:19:44 -08:00
parent 10f2864111
commit 527ede0c63
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/cgroup.c
View File

@ -685,9 +685,10 @@ static usec_t cgroup_cpu_adjust_period_and_log(Unit *u, usec_t period, usec_t qu
if (new_period != period) { if (new_period != period) {
char v[FORMAT_TIMESPAN_MAX]; char v[FORMAT_TIMESPAN_MAX];
log_unit_full(u, LOG_WARNING, 0, log_unit_full(u, u->warned_clamping_cpu_quota_period ? LOG_DEBUG : LOG_WARNING, 0,
"Clamping CPU interval for cpu.max: period is now %s", "Clamping CPU interval for cpu.max: period is now %s",
format_timespan(v, sizeof(v), new_period, 1)); format_timespan(v, sizeof(v), new_period, 1));
u->warned_clamping_cpu_quota_period = true;
} }
return new_period; return new_period;

2
src/core/dbus-cgroup.c
View File

@ -714,6 +714,7 @@ int bus_cgroup_set_property(
if (!UNIT_WRITE_FLAGS_NOOP(flags)) { if (!UNIT_WRITE_FLAGS_NOOP(flags)) {
c->cpu_quota_per_sec_usec = u64; c->cpu_quota_per_sec_usec = u64;
u->warned_clamping_cpu_quota_period = false;
unit_invalidate_cgroup(u, CGROUP_MASK_CPU); unit_invalidate_cgroup(u, CGROUP_MASK_CPU);
if (c->cpu_quota_per_sec_usec == USEC_INFINITY) if (c->cpu_quota_per_sec_usec == USEC_INFINITY)
@ -737,6 +738,7 @@ int bus_cgroup_set_property(
if (!UNIT_WRITE_FLAGS_NOOP(flags)) { if (!UNIT_WRITE_FLAGS_NOOP(flags)) {
c->cpu_quota_period_usec = u64; c->cpu_quota_period_usec = u64;
u->warned_clamping_cpu_quota_period = false;
unit_invalidate_cgroup(u, CGROUP_MASK_CPU); unit_invalidate_cgroup(u, CGROUP_MASK_CPU);
if (c->cpu_quota_period_usec == USEC_INFINITY) if (c->cpu_quota_period_usec == USEC_INFINITY)
unit_write_setting(u, flags, "CPUQuotaPeriodSec", "CPUQuotaPeriodSec="); unit_write_setting(u, flags, "CPUQuotaPeriodSec", "CPUQuotaPeriodSec=");

3
src/core/unit.h
View File

@ -349,6 +349,9 @@ typedef struct Unit {
bool exported_log_rate_limit_interval:1; bool exported_log_rate_limit_interval:1;
bool exported_log_rate_limit_burst:1; bool exported_log_rate_limit_burst:1;
/* Whether we warned about clamping the CPU quota period */
bool warned_clamping_cpu_quota_period:1;
/* When writing transient unit files, stores which section we stored last. If < 0, we didn't write any yet. If /* When writing transient unit files, stores which section we stored last. If < 0, we didn't write any yet. If
* == 0 we are in the [Unit] section, if > 0 we are in the unit type-specific section. */ * == 0 we are in the [Unit] section, if > 0 we are in the unit type-specific section. */
signed int last_section_private:2; signed int last_section_private:2;