File gnome-shell-session-launch-timeout.patch of Package gnome-shell

Overview Repositories Revisions Requests Users Attributes Meta

File gnome-shell-session-launch-timeout.patch of Package gnome-shell (Revision 73fccc3d7191db9102e5991364d040ee)

Currently displaying revision 73fccc3d7191db9102e5991364d040ee , Show latest

From b88d757d4bbee8b20bdd2fb2bda8ea13f51f3837 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue, 15 Jun 2021 08:50:56 +0200
Subject: [PATCH] windowManager: Remove timeout on starting X11 services

With Xwayland started on demand, mutter/gnome-shell will spawn Xwayland
and GNOME settings daemon Xsettings.

Currently, gnome-shell uses a timeout of 5 seconds before canceling the
launch and declare failure to start X11 services.

While 5 seconds may seem like a lot of time, when this is executed on a
virtual machine part of a QA tests under load, this causes random
failures.

There is no good value here, we could increase the timeout but it will
always remain racy. Instead, remove the timeout, systemd itself already
has a timeout mechanism (with a much longer wait time).
---
 js/ui/windowManager.js | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index bacb6dddb5..d01bac19c7 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -907,14 +907,7 @@ var WindowManager = class {
         global.display.connect('init-xserver', (display, task) => {
             IBusManager.getIBusManager().restartDaemon(['--xim']);
 
-            /* Timeout waiting for start job completion after 5 seconds */
-            let cancellable = new Gio.Cancellable();
-            GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 5, () => {
-                cancellable.cancel();
-                return GLib.SOURCE_REMOVE;
-            });
-
-            this._startX11Services(task, cancellable);
+            this._startX11Services(task);
 
             return true;
         });
@@ -972,11 +965,11 @@ var WindowManager = class {
         });
     }
 
-    async _startX11Services(task, cancellable) {
+    async _startX11Services(task) {
         let status = true;
         try {
             await Shell.util_start_systemd_unit(
-                'gnome-session-x11-services-ready.target', 'fail', cancellable);
+                'gnome-session-x11-services-ready.target', 'fail', null);
         } catch (e) {
             // Ignore NOT_SUPPORTED error, which indicates we are not systemd
             // managed and gnome-session will have taken care of everything
-- 
GitLab

Places

File gnome-shell-session-launch-timeout.patch of Package gnome-shell (Revision 73fccc3d7191db9102e5991364d040ee)

Places