From 1a67ce5fc30123ccfe61a0876a863c059cd5245c Mon Sep 17 00:00:00 2001 From: Anita Zhang Date: Oct 13 2023 17:43:50 +0000 Subject: 253.7-1.8: Revert changes related to Fedora Shorter_Shutdown_Timer Increased coredump activity can cause high IO load and lead services into a death spiral (because more services start coredumping and increasing IO even more). Hyperscaler environments in particular do not tolerate this change well. --- diff --git a/10-timeout-abort.conf b/10-timeout-abort.conf deleted file mode 100644 index 4852648..0000000 --- a/10-timeout-abort.conf +++ /dev/null @@ -1,14 +0,0 @@ -# This file is part of the systemd package. -# See https://fedoraproject.org/wiki/Changes/Shorter_Shutdown_Timer. -# -# To facilitate debugging when a service fails to stop cleanly, -# TimeoutStopFailureMode=abort is set to "crash" services that fail to stop in -# the time allotted. This will cause the service to be terminated with SIGABRT -# and a coredump to be generated. -# -# To undo this configuration change, create a mask file: -# sudo mkdir -p /etc/systemd/system/service.d -# sudo ln -sv /dev/null /etc/systemd/system/service.d/10-timeout-abort.conf - -[Service] -TimeoutStopFailureMode=abort diff --git a/systemd.spec b/systemd.spec index b0f4369..c66d701 100644 --- a/systemd.spec +++ b/systemd.spec @@ -39,7 +39,7 @@ Version: 253.7 # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') %endif -Release: 1.7%{?dist} +Release: 1.8%{?dist} %global stable %(c="%version"; [ "$c" = "${c#*.*}" ]; echo $?) @@ -68,7 +68,6 @@ Source13: libsystemd-shared.abignore Source14: 10-oomd-defaults.conf Source15: 10-oomd-per-slice-defaults.conf -Source16: 10-timeout-abort.conf Source17: 10-map-count.conf Source21: macros.sysusers @@ -609,8 +608,6 @@ runs properly under an environment with SELinux enabled. # Let's disable the service. sed -r -i '/^enable systemd-boot-update.service/d' presets/90-systemd.preset -sed -r 's|/system/|/user/|g' %{SOURCE16} >10-timeout-abort.conf.user - # Lower the bpftool version requirement to 4.18.0 which has all the required # functionality backported in C8S/C9S. sed -r -i.old -e 's/>= 5.13.0/>= 4.18.0/g' -e 's/>= 5.6.0/>= 4.18.0/g' meson.build @@ -730,9 +727,6 @@ CONFIGURE_OPTS=( -Ddefault-llmnr=resolve # https://bugzilla.redhat.com/show_bug.cgi?id=2028169 -Dstatus-unit-format-default=combined - # https://fedoraproject.org/wiki/Changes/Shorter_Shutdown_Timer - -Ddefault-timeout-sec=45 - -Ddefault-user-timeout-sec=45 -Doomd=true -Dadm-gid=4 -Daudio-gid=63 @@ -895,9 +889,6 @@ install -D -t %{buildroot}/usr/lib/systemd/ %{SOURCE3} install -Dm0644 -t %{buildroot}%{_prefix}/lib/systemd/oomd.conf.d/ %{SOURCE14} install -Dm0644 -t %{buildroot}%{system_unit_dir}/system.slice.d/ %{SOURCE15} install -Dm0644 -t %{buildroot}%{user_unit_dir}/slice.d/ %{SOURCE15} -# https://fedoraproject.org/wiki/Changes/Shorter_Shutdown_Timer -install -Dm0644 -t %{buildroot}%{system_unit_dir}/service.d/ %{SOURCE16} -install -Dm0644 10-timeout-abort.conf.user %{buildroot}%{user_unit_dir}/service.d/10-timeout-abort.conf # https://fedoraproject.org/wiki/Changes/IncreaseVmMaxMapCount install -Dm0644 -t %{buildroot}%{_prefix}/lib/sysctl.d/ %{SOURCE17} @@ -1299,6 +1290,9 @@ rm -f .file-list-* rm -f %{name}.lang %changelog +* Fri Oct 13 2023 Anita Zhang - 253.7-1.8 +- Revert changes related to https://fedoraproject.org/wiki/Changes/Shorter_Shutdown_Timer + * Mon Oct 09 2023 Anita Zhang - 253.7-1.7 - Add threads dependency to test-process-util to fix C8s build