PR#249: Keep upstream default shutdown timeout for some variants - rpms/fedora-release

Timothée Ravier • a year ago

26ee8ab

default-timeout.conf

file added

		`@@ -0,0 +1,5 @@`
		`+ # Reset the default timeout to systemd upstream defaults`
		`+ # See: https://fedoraproject.org/wiki/Changes/Shorter_Shutdown_Timer`
		`+ DefaultTimeoutStartSec=90s`
		`+ DefaultTimeoutStopSec=90s`
		`+ DefaultDeviceTimeoutSec=90s`

fedora-release.spec

file modified

		`@@ -106,6 +106,7 @@`
		`Source25: plasma-desktop.conf`
		`Source26: 80-kde.preset`
		`Source27: 81-desktop.preset`
		`+ Source28: default-timeout.conf`
dustymabe commented a year ago I think we probably need to name this something more specific: `longer-default-shutdown-timeout.conf`.

		`BuildArch: noarch`

		`@@ -1190,6 +1191,8 @@`
		`sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/CoreOS/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.coreos`
		`sed -i -e "/^DEFAULT_HOSTNAME=/d" %{buildroot}%{_prefix}/lib/os-release.coreos`
		`install -Dm0644 %{SOURCE22} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/`
		`+ install -Dm0644 %{SOURCE28} -t %{buildroot}%{_prefix}/lib/systemd/system.conf.d/`
		`+ install -Dm0644 %{SOURCE28} -t %{buildroot}%{_prefix}/lib/systemd/user.conf.d/`
		`%endif`


		`@@ -1522,6 +1525,8 @@`
		`%files coreos`
		`%files identity-coreos`
		`%{_prefix}/lib/systemd/system-preset/80-coreos.preset`
		`+ %{_prefix}/lib/systemd/system.conf.d/default-timeout.conf`
		`+ %{_prefix}/lib/systemd/user.conf.d/default-timeout.conf`
		`%{_prefix}/lib/os-release.coreos`
		`%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.coreos`
		`%endif`

Reset the default timeout to systemd upstream defaults for the following
Fedora editions/variants:
- Fedora CoreOS

CC @pbrobinson for IoT if they want this too
CC @pboy for Server if they want this too
CC @dustymabe for Cloud if they want this too

For the model that Fedora Cloud handles, we actually might have preferred even shorter timeframes, since it saves money when shutting down instances.

I suspect you might want to reconsider your position of overriding the default for Fedora CoreOS based on that too.

Fedora CoreOS does not run only on Clouds and longer timeout are actually better for cloud instances as IOPS might be rate limited and thus storage operations might take longer than on bare metal for small instances. See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/K7YXBE35NJZIA5TGDC5OPNZHU6SWGE5N/.

If the Cloud SIG decides on smaller timeouts, we can make that happen here too (or in a separated PR).