From: Frantisek Sumsal Date: Sun, 28 Jun 2020 16:53:28 +0000 (+0200) Subject: test: bump the timeout for systemd-hwdb-update.service under ASan X-Git-Tag: v246-rc1~70 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f843190ff01ec9dd19c65d584ea34d14897f00b;p=thirdparty%2Fsystemd.git test: bump the timeout for systemd-hwdb-update.service under ASan Since the hwdb update from a79be2f80777eb80e0d8177f6bccd7615de7ec1a the systemd-hwdb-update service started timing out under ASan when compiled with gcc, as we started tripping over the 3 minutes timeout. This affects only gcc runs, since the current gcc on Arch still suffers from the detect_stack_use_after_return performance penalty[0]. Until the fixed gcc is present in the respective repositories, let's bump the timeout to 4 minutes, as we might not be able to upgrade right away, due to systemd/systemd#16199. Before the hwdb update: [ 7958.292540] systemd[63]: systemd-hwdb-update.service: Executing: /usr/bin/time systemd-hwdb update [ 7958.304005] systemd[1]: systemd-journald.service: Got notification message from PID 44 (FDSTORE=1) [ 7958.314434] systemd[1]: systemd-journald.service: Added fd 3 (n/a) to fd store. [ 8008.520082] systemd[1]: systemd-journald.service: Got notification message from PID 44 (WATCHDOG=1) [ 8068.520151] systemd[1]: systemd-journald.service: Got notification message from PID 44 (WATCHDOG=1) [ 8125.682843] time[63]: 84.47user 82.92system 2:47.50elapsed 99%CPU (0avgtext+0avgdata 811512maxresident)k [ 8125.682843] time[63]: 0inputs+19680outputs (0major+25000853minor)pagefaults 0swaps After the hwdb update: [ 6215.491958] systemd[63]: systemd-hwdb-update.service: Executing: /usr/bin/time systemd-hwdb update [ 6215.503380] systemd[1]: systemd-journald.service: Got notification message from PID 44 (FDSTORE=1) [ 6215.514172] systemd[1]: systemd-journald.service: Added fd 3 (n/a) to fd store. [ 6329.392918] systemd[1]: systemd-journald.service: Got notification message from PID 44 (WATCHDOG=1) [ 6394.920205] time[63]: 89.48user 89.98system 2:59.55elapsed 99%CPU (0avgtext+0avgdata 812764maxresident)k [ 6394.920205] time[63]: 0inputs+20568outputs (0major+27318354minor)pagefaults 0swaps [0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94910 --- diff --git a/test/test-functions b/test/test-functions index f7f604aec3a..456bfe66691 100644 --- a/test/test-functions +++ b/test/test-functions @@ -573,7 +573,7 @@ printf "[Service]\nStandardOutput=file:/systemd-journald.out\n" >"\$JOURNALD_CON # under ASan+UBSan in containers, which, in turn, are run in VMs. # Let's limit which environments such services should be executed in. mkdir -p /etc/systemd/system/systemd-hwdb-update.service.d -printf "[Unit]\nConditionVirtualization=container\n\n[Service]\nTimeoutSec=180s\n" >/etc/systemd/system/systemd-hwdb-update.service.d/env-override.conf +printf "[Unit]\nConditionVirtualization=container\n\n[Service]\nTimeoutSec=240s\n" >/etc/systemd/system/systemd-hwdb-update.service.d/env-override.conf # Let's override another hard-coded timeout that kicks in too early mkdir -p /etc/systemd/system/systemd-journal-flush.service.d