diff --git a/dbus.spec b/dbus.spec index f95d4785f50633d89024293ddc3c8ffc79eabd64..35555291b6400d2b0f111a6abd557cb518ab8159 100644 --- a/dbus.spec +++ b/dbus.spec @@ -1,7 +1,7 @@ Name: dbus Epoch: 1 Version: 1.12.20 -Release: 4 +Release: 5 Summary: System Message Bus License: AFLv3.0 or GPLv2+ URL: http://www.freedesktop.org/Software/dbus/ @@ -9,6 +9,7 @@ Source0: https://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz Source1: 00-start-message-bus.sh Patch0001: bugfix-let-systemd-restart-dbus-when-the-it-enters-failed.patch +Patch0002: print-load-average-when-activate-service-timeout.patch BuildRequires: systemd-devel expat-devel libselinux-devel audit-libs-devel doxygen xmlto cmake BuildRequires: autoconf-archive libtool libX11-devel libcap-ng-devel libxslt @@ -221,6 +222,9 @@ fi %exclude %{_pkgdocdir}/README %changelog +* Tue Nov 30 2021 xuxiaozhou - 1:1.12.20-5 +- add print-load-average-when-activate-service-timeout.patch for more debug information + * Thu Jul 22 2021 yangmingtai - 1:1.12.20-4 - remove build requires of gdb diff --git a/print-load-average-when-activate-service-timeout.patch b/print-load-average-when-activate-service-timeout.patch new file mode 100644 index 0000000000000000000000000000000000000000..89285591990a6de60d4bf148d73e73896655907f --- /dev/null +++ b/print-load-average-when-activate-service-timeout.patch @@ -0,0 +1,83 @@ +From 6f678dd638af6513602822ca5ce56393b1e07cf3 Mon Sep 17 00:00:00 2001 +From: x00283583 +Date: Tue, 30 Nov 2021 15:45:08 +0800 +Subject: [PATCH] print load average when activate service timeout + +--- + bus/activation.c | 29 +++++++++++++++++++++++++++-- + 1 file changed, 27 insertions(+), 2 deletions(-) + +diff --git a/bus/activation.c b/bus/activation.c +index 99404b9..e0db646 100644 +--- a/bus/activation.c ++++ b/bus/activation.c +@@ -24,6 +24,7 @@ + */ + + #include ++#include + #include "activation.h" + #include "activation-exit-codes.h" + #include "config-parser.h" +@@ -43,6 +44,8 @@ + #include + #endif + ++#define LOADAVG_LEN_MAX 256 ++ + struct BusActivation + { + int refcount; +@@ -1526,6 +1529,25 @@ toggle_babysitter_watch (DBusWatch *watch, + watch); + } + ++static dbus_bool_t ++read_loadavg (char *load_avg) ++{ ++ FILE *fp; ++ int rc; ++ ++ if ((fp = fopen("/proc/loadavg", "r")) == NULL) ++ return FALSE; ++ ++ rc = fscanf(fp, "%[^\n]", load_avg); ++ ++ fclose(fp); ++ ++ if (rc < 1) ++ return FALSE; ++ ++ return TRUE; ++} ++ + static dbus_bool_t + pending_activation_timed_out (void *data) + { +@@ -1533,6 +1555,7 @@ pending_activation_timed_out (void *data) + BusContext *context; + DBusError error; + int timeout; ++ char load_avg[LOADAVG_LEN_MAX] = ""; + + context = pending_activation->activation->context; + timeout = bus_context_get_activation_timeout (context); +@@ -1546,11 +1569,13 @@ pending_activation_timed_out (void *data) + + dbus_error_init (&error); + ++ (void)read_loadavg(load_avg); ++ + bus_context_log_and_set_error (context, DBUS_SYSTEM_LOG_WARNING, &error, + DBUS_ERROR_TIMED_OUT, + "Failed to activate service '%s': timed out " +- "(service_start_timeout=%dms)", +- pending_activation->service_name, timeout); ++ "(service_start_timeout=%dms), load average: %s", ++ pending_activation->service_name, timeout, load_avg); + + pending_activation_failed (pending_activation, &error); + +-- +2.23.0 +