daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
4cad4c
From 9d58db234dc9f22a4f551b1b06bd9fc60d085f4d Mon Sep 17 00:00:00 2001
4cad4c
From: Filipe Brandenburger <filbranden@google.com>
4cad4c
Date: Wed, 23 Jan 2019 20:19:44 -0800
4cad4c
Subject: [PATCH] core: downgrade CPUQuotaPeriodSec= clamping logs to debug
4cad4c
4cad4c
After the first warning log, further messages are downgraded to LOG_DEBUG.
4cad4c
4cad4c
(cherry picked from commit 527ede0c638b47b62a87900438a8a09dea42889e)
4cad4c
4cad4c
Related: #1770379
4cad4c
---
4cad4c
 src/core/cgroup.c      | 3 ++-
4cad4c
 src/core/dbus-cgroup.c | 2 ++
4cad4c
 src/core/unit.h        | 3 +++
4cad4c
 3 files changed, 7 insertions(+), 1 deletion(-)
4cad4c
4cad4c
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
4cad4c
index 45fd64a394..f8b351a65d 100644
4cad4c
--- a/src/core/cgroup.c
4cad4c
+++ b/src/core/cgroup.c
4cad4c
@@ -544,9 +544,10 @@ static usec_t cgroup_cpu_adjust_period_and_log(Unit *u, usec_t period, usec_t qu
4cad4c
 
4cad4c
         if (new_period != period) {
4cad4c
                 char v[FORMAT_TIMESPAN_MAX];
4cad4c
-                log_unit_full(u, LOG_WARNING, 0,
4cad4c
+                log_unit_full(u, u->warned_clamping_cpu_quota_period ? LOG_DEBUG : LOG_WARNING, 0,
4cad4c
                               "Clamping CPU interval for cpu.max: period is now %s",
4cad4c
                               format_timespan(v, sizeof(v), new_period, 1));
4cad4c
+                u->warned_clamping_cpu_quota_period = true;
4cad4c
         }
4cad4c
 
4cad4c
         return new_period;
4cad4c
diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
4cad4c
index c8b918e45d..4555b33b1f 100644
4cad4c
--- a/src/core/dbus-cgroup.c
4cad4c
+++ b/src/core/dbus-cgroup.c
4cad4c
@@ -712,6 +712,7 @@ int bus_cgroup_set_property(
4cad4c
 
4cad4c
                 if (!UNIT_WRITE_FLAGS_NOOP(flags)) {
4cad4c
                         c->cpu_quota_per_sec_usec = u64;
4cad4c
+                        u->warned_clamping_cpu_quota_period = false;
4cad4c
                         unit_invalidate_cgroup(u, CGROUP_MASK_CPU);
4cad4c
 
4cad4c
                         if (c->cpu_quota_per_sec_usec == USEC_INFINITY)
4cad4c
@@ -735,6 +736,7 @@ int bus_cgroup_set_property(
4cad4c
 
4cad4c
                 if (!UNIT_WRITE_FLAGS_NOOP(flags)) {
4cad4c
                         c->cpu_quota_period_usec = u64;
4cad4c
+                        u->warned_clamping_cpu_quota_period = false;
4cad4c
                         unit_invalidate_cgroup(u, CGROUP_MASK_CPU);
4cad4c
                         if (c->cpu_quota_period_usec == USEC_INFINITY)
4cad4c
                                 unit_write_setting(u, flags, "CPUQuotaPeriodSec", "CPUQuotaPeriodSec=");
4cad4c
diff --git a/src/core/unit.h b/src/core/unit.h
4cad4c
index 39179f5fd4..b40ff9b961 100644
4cad4c
--- a/src/core/unit.h
4cad4c
+++ b/src/core/unit.h
4cad4c
@@ -356,6 +356,9 @@ typedef struct Unit {
4cad4c
         bool exported_log_rate_limit_interval:1;
4cad4c
         bool exported_log_rate_limit_burst:1;
4cad4c
 
4cad4c
+        /* Whether we warned about clamping the CPU quota period */
4cad4c
+        bool warned_clamping_cpu_quota_period:1;
4cad4c
+
4cad4c
         /* When writing transient unit files, stores which section we stored last. If < 0, we didn't write any yet. If
4cad4c
          * == 0 we are in the [Unit] section, if > 0 we are in the unit type-specific section. */
4cad4c
         int last_section_private:2;