[3/3] weston-init: disable systemd watchdog option

Message ID 20220212104022.842655-3-alex@linutronix.de
State Accepted, archived
Commit f4d8ad399d88dbd9d65bbfd0467f15a485e66605
Headers show
Series [1/3] weston-init: replace deprecated/disabled fbdev with drm backend | expand

Commit Message

Alexander Kanavin Feb. 12, 2022, 10:40 a.m. UTC
This starts to behave weirdly when test_date is adjusting the clock,
which means weston is restarted without need so disable for weston
test stability.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-graphics/wayland/weston-init/weston.service | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Richard Purdie Feb. 13, 2022, 12:38 p.m. UTC | #1
On Sat, 2022-02-12 at 11:40 +0100, Alexander Kanavin wrote:
> This starts to behave weirdly when test_date is adjusting the clock,
> which means weston is restarted without need so disable for weston
> test stability.
> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  meta/recipes-graphics/wayland/weston-init/weston.service | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-graphics/wayland/weston-init/weston.service b/meta/recipes-graphics/wayland/weston-init/weston.service
> index e09625b31c..80745998ed 100644
> --- a/meta/recipes-graphics/wayland/weston-init/weston.service
> +++ b/meta/recipes-graphics/wayland/weston-init/weston.service
> @@ -37,8 +37,8 @@ EnvironmentFile=/etc/default/weston
>  ExecStart=/usr/bin/weston --modules=systemd-notify.so
>  
>  # Optional watchdog setup
> -TimeoutStartSec=60
> -WatchdogSec=20
> +#TimeoutStartSec=60
> +#WatchdogSec=20
>  
>  # The user to run Weston as.
>  User=weston

Whilst that fixes the tests, should we be doing that for production systems?

Cheers,

Richard
Alexander Kanavin Feb. 13, 2022, 5:58 p.m. UTC | #2
On Sun, 13 Feb 2022 at 13:39, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> >  # Optional watchdog setup
> > -TimeoutStartSec=60
> > -WatchdogSec=20
> > +#TimeoutStartSec=60
> > +#WatchdogSec=20
> >
> >  # The user to run Weston as.
> >  User=weston
>
> Whilst that fixes the tests, should we be doing that for production systems?

No other systemd unit that we ship is using the watchdog feature. For
weston it was an accidental addition, due to import from elsewhere.

BTW, we didn't see the issue until now because it won't show up on kvm
qemu (qemux86/qemux86_64), but I ran this across a-full, and
ppc/mips/arm all failed due to their non-kvm test timings.

Alex

Patch

diff --git a/meta/recipes-graphics/wayland/weston-init/weston.service b/meta/recipes-graphics/wayland/weston-init/weston.service
index e09625b31c..80745998ed 100644
--- a/meta/recipes-graphics/wayland/weston-init/weston.service
+++ b/meta/recipes-graphics/wayland/weston-init/weston.service
@@ -37,8 +37,8 @@  EnvironmentFile=/etc/default/weston
 ExecStart=/usr/bin/weston --modules=systemd-notify.so
 
 # Optional watchdog setup
-TimeoutStartSec=60
-WatchdogSec=20
+#TimeoutStartSec=60
+#WatchdogSec=20
 
 # The user to run Weston as.
 User=weston