diff --git a/patches/0015-ceph-osd-postinst-avoid-reloading-all-sysctl-setting.patch b/patches/0015-ceph-osd-postinst-avoid-reloading-all-sysctl-setting.patch new file mode 100644 index 000000000..947175605 --- /dev/null +++ b/patches/0015-ceph-osd-postinst-avoid-reloading-all-sysctl-setting.patch @@ -0,0 +1,47 @@ +From 232b1fa3210a56354b27f9c6154819307412b91c Mon Sep 17 00:00:00 2001 +From: Friedrich Weber +Date: Thu, 8 Feb 2024 16:20:08 +0100 +Subject: [PATCH] ceph-osd postinst: do not always reload all sysctl settings +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +ceph-osd installs a /etc/sysctl.d/30-ceph-osd.conf with custom sysctl +settings. Currently, in order to apply them, ceph-osd postinst always +restarts procps. However, this triggers a reload of *all* sysctl +settings when installing or upgrading the ceph-osd package. This may +needlessly reset unrelated settings manually changed by the user. + +To avoid this, invoke /lib/systemd/systemd-sysctl manually to apply +the custom sysctl settings only, and only do so on fresh installs of +the package. + +If 30-ceph-osd.conf is changed in the future, the ceph-osd postinst +will need to be adjusted to apply the sysctl settings on upgrade too. + +Suggested-by: Fabian Grünbichler +Signed-off-by: Friedrich Weber +--- + debian/ceph-osd.postinst | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/debian/ceph-osd.postinst b/debian/ceph-osd.postinst +index 04e33b8601f..2bcd8d4dcb4 100644 +--- a/debian/ceph-osd.postinst ++++ b/debian/ceph-osd.postinst +@@ -24,7 +24,11 @@ set -e + + case "$1" in + configure) +- [ -x /etc/init.d/procps ] && invoke-rc.d procps restart || : ++ # apply (only) new parameters, but only on fresh install ++ if [ -z "$2" ]; then ++ /lib/systemd/systemd-sysctl /etc/sysctl.d/30-ceph-osd.conf \ ++ >/dev/null || : ++ fi + [ -x /sbin/start ] && start ceph-osd-all || : + ;; + abort-upgrade|abort-remove|abort-deconfigure) +-- +2.39.2 + diff --git a/patches/series b/patches/series index 865caf23d..6ad754713 100644 --- a/patches/series +++ b/patches/series @@ -12,3 +12,4 @@ 0012-backport-mgr-dashboard-simplify-authentication-proto.patch 0013-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch 0014-rocksb-inherit-parent-cmake-cxx-flags.patch +0015-ceph-osd-postinst-avoid-reloading-all-sysctl-setting.patch