From 835fbe5f758f7580ba2caf8d6d6155821895eb0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Jun 2024 12:19:39 +0200 Subject: [PATCH] bus-unit-util: extend the bus call timeout for UnitFreezer Follow-up for 1d617b35fef5f7783287965f766c8bb85e932b8e. Should fix https://github.com/systemd/systemd/issues/33269. From the logs in the bug: Jun 10 22:55:37 systemd-logind[909]: The system will suspend now! Jun 10 22:55:37 ModemManager[996]: [sleep-monitor-systemd] system is about to suspend ... Jun 10 22:55:48 systemd-sleep[422408]: Failed to freeze unit 'user.slice': Connection timed out Jun 10 22:55:48 systemd-sleep[422408]: Performing sleep operation 'suspend'... The delay is ~11 s, consistent with the patch that set the timeout to 10 s. Looks like this is not enough. It's the freeze operation that fails, but thawing might be slow too, so just bump the timeout again. --- src/shared/bus-unit-util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c index 22dbf62ab2..da83422524 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c @@ -2945,8 +2945,8 @@ typedef struct UnitFreezer { sd_bus *bus; } UnitFreezer; -/* Wait for 10 seconds at maximum for freezer operation */ -#define FREEZE_BUS_CALL_TIMEOUT (10 * USEC_PER_SEC) +/* Wait for 60 seconds at maximum for freezer operation */ +#define FREEZE_BUS_CALL_TIMEOUT (60 * USEC_PER_SEC) UnitFreezer* unit_freezer_free(UnitFreezer *f) { if (!f)