diff options
| author | Filipe Brandenburger <filbranden@google.com> | 2019-01-23 20:19:44 -0800 |
|---|---|---|
| committer | The Plumber <50238977+systemd-rhel-bot@users.noreply.github.com> | 2020-06-08 16:00:42 +0200 |
| commit | 9d58db234dc9f22a4f551b1b06bd9fc60d085f4d (patch) | |
| tree | 2331d05b4a8f0b93f1a25210f5123f519299c7e9 | |
| parent | 11df25536319a4c0f3276c2218054243d9ee213c (diff) | |
| download | systemd-9d58db234dc9f22a4f551b1b06bd9fc60d085f4d.tar.gz | |
core: downgrade CPUQuotaPeriodSec= clamping logs to debug
After the first warning log, further messages are downgraded to LOG_DEBUG.
(cherry picked from commit 527ede0c638b47b62a87900438a8a09dea42889e)
Related: #1770379
| -rw-r--r-- | src/core/cgroup.c | 3 | ||||
| -rw-r--r-- | src/core/dbus-cgroup.c | 2 | ||||
| -rw-r--r-- | src/core/unit.h | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 45fd64a394..f8b351a65d 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -544,9 +544,10 @@ static usec_t cgroup_cpu_adjust_period_and_log(Unit *u, usec_t period, usec_t qu if (new_period != period) { 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", format_timespan(v, sizeof(v), new_period, 1)); + u->warned_clamping_cpu_quota_period = true; } return new_period; diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c index c8b918e45d..4555b33b1f 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c @@ -712,6 +712,7 @@ int bus_cgroup_set_property( if (!UNIT_WRITE_FLAGS_NOOP(flags)) { c->cpu_quota_per_sec_usec = u64; + u->warned_clamping_cpu_quota_period = false; unit_invalidate_cgroup(u, CGROUP_MASK_CPU); if (c->cpu_quota_per_sec_usec == USEC_INFINITY) @@ -735,6 +736,7 @@ int bus_cgroup_set_property( if (!UNIT_WRITE_FLAGS_NOOP(flags)) { c->cpu_quota_period_usec = u64; + u->warned_clamping_cpu_quota_period = false; unit_invalidate_cgroup(u, CGROUP_MASK_CPU); if (c->cpu_quota_period_usec == USEC_INFINITY) unit_write_setting(u, flags, "CPUQuotaPeriodSec", "CPUQuotaPeriodSec="); diff --git a/src/core/unit.h b/src/core/unit.h index 39179f5fd4..b40ff9b961 100644 --- a/src/core/unit.h +++ b/src/core/unit.h @@ -356,6 +356,9 @@ typedef struct Unit { bool exported_log_rate_limit_interval: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 * == 0 we are in the [Unit] section, if > 0 we are in the unit type-specific section. */ int last_section_private:2; |