From 30273d3292fc111d6e675d325c10063ff0eadf47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 30 Jul 2020 21:19:54 +0200 Subject: [PATCH] Release v246 --- 0001-Bump-tmp-size-back-to-50-of-RAM.patch | 38 -------- ...til-do-not-assume-dev-is-always-real.patch | 59 ------------- 0001-test-ndisc-rs-increase-timeouts.patch | 58 ------------ 0001-test-path-increase-timeout.patch | 88 ------------------- sources | 2 +- systemd.spec | 8 +- 6 files changed, 4 insertions(+), 249 deletions(-) delete mode 100644 0001-Bump-tmp-size-back-to-50-of-RAM.patch delete mode 100644 0001-test-fs-util-do-not-assume-dev-is-always-real.patch delete mode 100644 0001-test-ndisc-rs-increase-timeouts.patch delete mode 100644 0001-test-path-increase-timeout.patch diff --git a/0001-Bump-tmp-size-back-to-50-of-RAM.patch b/0001-Bump-tmp-size-back-to-50-of-RAM.patch deleted file mode 100644 index 372bd93..0000000 --- a/0001-Bump-tmp-size-back-to-50-of-RAM.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4b09123e9b0554ed67937ca00a5c4cfd3f9c43ef Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 24 Jul 2020 22:05:21 +0200 -Subject: [PATCH] Bump /tmp size back to 50% of RAM - -This should be enough to fix https://bugzilla.redhat.com/show_bug.cgi?id=1856514. -But the limit should be significantly higher than 10% anyway. By setting a -limit on /tmp at 10% we'll break many reasonable use cases, even though the -machine would deal fine with a much larger fraction devoted to /tmp. -(In the first version of this patch I made it 25% with the comment that -"Even 25% might be too low.". The kernel default is 50%, and we have been using -that seemingly without trouble since https://fedoraproject.org/wiki/Features/tmp-on-tmpfs. -So let's just make it 50% again.) - -See 7d85383edbab73274dc81cc888d884bb01070bc2. - -(Another consideration is that we learned from from the whole initiative with -zram in Fedora that a reasonable size for zram is 0.5-1.5 of RAM, and that pretty -much all systems benefit from having zram or zswap enabled. Thus it is reasonable -to assume that it'll become widely used. Taking the usual compression effectiveness -of 0.2 into account, machines have effective memory available of between -1.0 - 0.2*0.5 + 0.5 = 1.4 (for zram sized to 0.5 of RAM) and -1.0 - 0.2*1.5 + 1.5 = 2.2 (for zram 1.5 sized to 1.5 of RAM) times RAM size. -This means that the 10% was really like 7-4% of effective memory.) ---- - units/tmp.mount | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/units/tmp.mount b/units/tmp.mount -index 7066e52261..cf6837852f 100644 ---- a/units/tmp.mount -+++ b/units/tmp.mount -@@ -22,4 +22,4 @@ After=swap.target - What=tmpfs - Where=/tmp - Type=tmpfs --Options=mode=1777,strictatime,nosuid,nodev,size=10%,nr_inodes=400k -+Options=mode=1777,strictatime,nosuid,nodev,size=50%,nr_inodes=400k diff --git a/0001-test-fs-util-do-not-assume-dev-is-always-real.patch b/0001-test-fs-util-do-not-assume-dev-is-always-real.patch deleted file mode 100644 index 2a7d2db..0000000 --- a/0001-test-fs-util-do-not-assume-dev-is-always-real.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 34421f9caaa90224108e6c322985c479a49cbef9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Mon, 27 Jul 2020 13:49:12 +0200 -Subject: [PATCH] test-fs-util: do not assume /dev is always real - -When building in Fedora's koji, test-fs-util would fail: ---- command --- -10:18:29 SYSTEMD_LANGUAGE_FALLBACK_MAP='/builddir/build/BUILD/systemd-246-rc2/src/locale/language-fallback-map' PATH='/builddir/build/BUILD/systemd-246-rc2/x86_64-redhat-linux-gnu:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin' SYSTEMD_KBD_MODEL_MAP='/builddir/build/BUILD/systemd-246-rc2/src/locale/kbd-model-map' /builddir/build/BUILD/systemd-246-rc2/x86_64-redhat-linux-gnu/test-fs-util ---- stderr --- -/* test_chase_symlinks */ -/* test_unlink_noerrno */ -/* test_readlink_and_make_absolute */ -/* test_var_tmp */ -/* test_dot_or_dot_dot */ -/* test_access_fd */ -/* test_touch_file */ -/* test_unlinkat_deallocate */ -/* test_fsync_directory_of_file */ -/* test_rename_noreplace */ -/* test_path_is_encrypted */ -/home encrypted: yes -/var encrypted: yes -/ encrypted: yes -/proc encrypted: no -/sys encrypted: no -/dev encrypted: yes -Assertion 'expect < 0 || ((r > 0) == (expect > 0))' failed at src/test/test-fs-util.c:863, function test_path_is_encrypted_one(). Aborting. -------- - -It seems / is encrypted, but /dev is just a normal directory. ---- - src/test/test-fs-util.c | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c -index 8d9a1974b2..611057b90f 100644 ---- a/src/test/test-fs-util.c -+++ b/src/test/test-fs-util.c -@@ -864,14 +864,16 @@ static void test_path_is_encrypted_one(const char *p, int expect) { - } - - static void test_path_is_encrypted(void) { -- log_info("/* %s */", __func__); -+ int booted = sd_booted(); -+ -+ log_info("/* %s (sd_booted=%d)*/", __func__, booted); - - test_path_is_encrypted_one("/home", -1); - test_path_is_encrypted_one("/var", -1); - test_path_is_encrypted_one("/", -1); -- test_path_is_encrypted_one("/proc", false); -- test_path_is_encrypted_one("/sys", false); -- test_path_is_encrypted_one("/dev", false); -+ test_path_is_encrypted_one("/proc", booted > 0 ? false : -1); -+ test_path_is_encrypted_one("/sys", booted > 0 ? false : -1); -+ test_path_is_encrypted_one("/dev", booted > 0 ? false : -1); - } - - int main(int argc, char *argv[]) { diff --git a/0001-test-ndisc-rs-increase-timeouts.patch b/0001-test-ndisc-rs-increase-timeouts.patch deleted file mode 100644 index ec14e30..0000000 --- a/0001-test-ndisc-rs-increase-timeouts.patch +++ /dev/null @@ -1,58 +0,0 @@ -From ea21882c9a18f2fc422c9090cd262a64cb452ee9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Mon, 27 Jul 2020 16:09:22 +0200 -Subject: [PATCH] test-ndisc-rs: increase timeouts - -Timestamp: Mon 2020-07-27 13:50:50 UTC -Monotonic: 985702942708 -Hop limit: 64 -Flags: <|MANAGED> -Preference: medium -Lifetime: 180 -No MTU set ->> Option 3 -Valid Lifetime: 500 -Preferred Lifetime: 440 -Flags: -Prefix Length: 64 -Prefix: 2001:db8:dead:beef:: ->> Option 25 -DNS: 2001:db8:dead:beef::1 -Lifetime: 60 ->> Option 31 -Domain: lab.intra -Lifetime: 60 ->> Option 1 -Address: 782bcbb36d53 -NDISC: Started IPv6 Router Solicitation client -backoff timeout interval 1 3.600s <= 3.987s <= 4.400s -NDISC: Sent Router Solicitation, next solicitation in 3s -backoff timeout interval 2 7.576s <= 8.114s <= 8.374s -NDISC: Sent Router Solicitation, next solicitation in 8s -Assertion 'false' failed at src/libsystemd-network/test-ndisc-rs.c:172, function test_rs_hangcheck(). Aborting. ---- - src/libsystemd-network/test-ndisc-rs.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libsystemd-network/test-ndisc-rs.c b/src/libsystemd-network/test-ndisc-rs.c -index 5d1e66fcdc..1bc3499d07 100644 ---- a/src/libsystemd-network/test-ndisc-rs.c -+++ b/src/libsystemd-network/test-ndisc-rs.c -@@ -291,7 +291,7 @@ static void test_rs(void) { - assert_se(sd_ndisc_set_callback(nd, test_callback, e) >= 0); - - assert_se(sd_event_add_time(e, &test_hangcheck, clock_boottime_or_monotonic(), -- time_now + 2 *USEC_PER_SEC, 0, -+ time_now + 30 * USEC_PER_SEC, 0, - test_rs_hangcheck, NULL) >= 0); - - assert_se(sd_ndisc_stop(nd) >= 0); -@@ -393,7 +393,7 @@ static void test_timeout(void) { - assert_se(sd_ndisc_set_mac(nd, &mac_addr) >= 0); - - assert_se(sd_event_add_time(e, &test_hangcheck, clock_boottime_or_monotonic(), -- time_now + 2U * USEC_PER_SEC, 0, -+ time_now + 30 * USEC_PER_SEC, 0, - test_rs_hangcheck, NULL) >= 0); - - assert_se(sd_ndisc_start(nd) >= 0); diff --git a/0001-test-path-increase-timeout.patch b/0001-test-path-increase-timeout.patch deleted file mode 100644 index c9fd1d9..0000000 --- a/0001-test-path-increase-timeout.patch +++ /dev/null @@ -1,88 +0,0 @@ -From d42b6d20b8565c543547fd0ebde9774a854580f9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Mon, 27 Jul 2020 15:08:35 +0200 -Subject: [PATCH] test-path: increase timeout - -The tests fail in Fedora's koji with a timeout. Let's just bump -the timeout: ---- stderr --- -Failed to connect to system bus: No such file or directory --.slice: Failed to enable/disable controllers on cgroup /system.slice/kojid.service, ignoring: Permission denied -path-exists.service: Failed to create cgroup /system.slice/kojid.service/path-exists.service: Permission denied -path-exists.service: Succeeded. --.slice: Failed to enable/disable controllers on cgroup /system.slice/kojid.service, ignoring: Permission denied -path-exists.service: Failed to create cgroup /system.slice/kojid.service/path-exists.service: Permission denied -path-exists.service: Succeeded. -path-exists.path: Succeeded. -Failed to connect to system bus: No such file or directory --.slice: Failed to enable/disable controllers on cgroup /system.slice/kojid.service, ignoring: Permission denied -path-existsglob.service: Failed to create cgroup /system.slice/kojid.service/path-existsglob.service: Permission denied -path-existsglob.service: Succeeded. --.slice: Failed to enable/disable controllers on cgroup /system.slice/kojid.service, ignoring: Permission denied -path-existsglob.service: Failed to create cgroup /system.slice/kojid.service/path-existsglob.service: Permission denied -path-existsglob.service: Succeeded. -path-existsglob.path: Succeeded. -Failed to connect to system bus: No such file or directory --.slice: Failed to enable/disable controllers on cgroup /system.slice/kojid.service, ignoring: Permission denied -path-changed.service: Failed to create cgroup /system.slice/kojid.service/path-changed.service: Permission denied -path-changed.service: Succeeded. --.slice: Failed to enable/disable controllers on cgroup /system.slice/kojid.service, ignoring: Permission denied -path-changed.service: Failed to create cgroup /system.slice/kojid.service/path-changed.service: Permission denied -path-changed.service: Succeeded. -path-changed.path: Succeeded. -Failed to connect to system bus: No such file or directory --.slice: Failed to enable/disable controllers on cgroup /system.slice/kojid.service, ignoring: Permission denied -path-modified.service: Failed to create cgroup /system.slice/kojid.service/path-modified.service: Permission denied -path-modified.service: Succeeded. --.slice: Failed to enable/disable controllers on cgroup /system.slice/kojid.service, ignoring: Permission denied -path-modified.service: Failed to create cgroup /system.slice/kojid.service/path-modified.service: Permission denied -path-modified.service: Succeeded. -path-modified.path: Succeeded. -Failed to connect to system bus: No such file or directory --.slice: Failed to enable/disable controllers on cgroup /system.slice/kojid.service, ignoring: Permission denied -path-mycustomunit.service: Failed to create cgroup /system.slice/kojid.service/path-mycustomunit.service: Permission denied -path-mycustomunit.service: Succeeded. -path-unit.path: Succeeded. -Failed to connect to system bus: No such file or directory --.slice: Failed to enable/disable controllers on cgroup /system.slice/kojid.service, ignoring: Permission denied -path-directorynotempty.service: Failed to create cgroup /system.slice/kojid.service/path-directorynotempty.service: Permission denied -path-directorynotempty.service: Succeeded. --.slice: Failed to enable/disable controllers on cgroup /system.slice/kojid.service, ignoring: Permission denied -path-directorynotempty.service: Failed to create cgroup /system.slice/kojid.service/path-directorynotempty.service: Permission denied -path-directorynotempty.service: Failed to attach to cgroup /system.slice/kojid.service/path-directorynotempty.service: No such file or directory -path-directorynotempty.service: Failed at step CGROUP spawning /bin/true: No such file or directory -path-directorynotempty.service: Main process exited, code=exited, status=219/CGROUP -path-directorynotempty.service: Failed with result 'exit-code'. -Test timeout when testing path-directorynotempty.path ---- - src/test/test-path.c | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/src/test/test-path.c b/src/test/test-path.c -index e8844fd5ef..b4fb2479ec 100644 ---- a/src/test/test-path.c -+++ b/src/test/test-path.c -@@ -79,13 +79,10 @@ static Service *service_for_path(Manager *m, Path *path, const char *service_nam - } - - static void check_states(Manager *m, Path *path, Service *service, PathState path_state, ServiceState service_state) { -- usec_t ts; -- usec_t timeout = 2 * USEC_PER_SEC; -- - assert_se(m); - assert_se(service); - -- ts = now(CLOCK_MONOTONIC); -+ usec_t ts = now(CLOCK_MONOTONIC); - - while (path->result != PATH_SUCCESS || service->result != SERVICE_SUCCESS || - path->state != path_state || service->state != service_state) { -@@ -105,7 +102,7 @@ static void check_states(Manager *m, Path *path, Service *service, PathState pat - service_result_to_string(service->result)); - - n = now(CLOCK_MONOTONIC); -- if (ts + timeout < n) { -+ if (ts + 30 * USEC_PER_SEC < n) { - log_error("Test timeout when testing %s", UNIT(path)->id); - exit(EXIT_FAILURE); - } diff --git a/sources b/sources index 9d74c81..f53c8e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemd-246-rc2.tar.gz) = c793e1c6cb03d336096e5690c56b67852df93bc258558df219c095b18ca7e5f98e00891ce7e9153ff287b486ed118ebdcd9364e7984d40134e3a0e3c77c80b84 +SHA512 (systemd-246.tar.gz) = 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f diff --git a/systemd.spec b/systemd.spec index c32f8ec..a86e1a4 100644 --- a/systemd.spec +++ b/systemd.spec @@ -70,11 +70,6 @@ GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[ # https://bugzilla.redhat.com/show_bug.cgi?id=1738828 Patch0001: use-bfq-scheduler.patch -Patch0002: 0001-Bump-tmp-size-back-to-50-of-RAM.patch -Patch0003: 0001-test-fs-util-do-not-assume-dev-is-always-real.patch -Patch0004: 0001-test-path-increase-timeout.patch -Patch0005: 0001-test-ndisc-rs-increase-timeouts.patch - %ifarch %{ix86} x86_64 aarch64 %global have_gnu_efi 1 %endif @@ -790,6 +785,9 @@ fi %files tests -f .file-list-tests %changelog +* Thu Jul 30 2020 Zbigniew Jędrzejewski-Szmek - 246~rc2-2 +- Update to released version. Only some minor bugfixes since the pre-release. + * Sun Jul 26 2020 Zbigniew Jędrzejewski-Szmek - 246~rc2-2 - Make /tmp be 50% of RAM again (#1856514) - Re-run 'systemctl preset systemd-resolved' on upgrades.