systemd-analyze: add service-watchdogs verb

New debug verb that enables or disables the service runtime watchdogs
and emergency actions during runtime. This is the systemd-analyze
version of the systemd.service_watchdogs command line option.

diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
index 876f96d..7e54531 100644 (file)
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -53,7 +53,7 @@
 
   <refnamediv>
     <refname>systemd-analyze</refname>
-    <refpurpose>Analyze system boot-up performance</refpurpose>
+    <refpurpose>Analyze and debug system manager</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
@@ -131,6 +131,12 @@
       <arg choice="plain">calendar</arg>
       <arg choice="plain" rep="repeat"><replaceable>SPECS</replaceable></arg>
     </cmdsynopsis>
+    <cmdsynopsis>
+      <command>systemd-analyze</command>
+      <arg choice="opt" rep="repeat">OPTIONS</arg>
+      <arg choice="plain">service-watchdogs</arg>
+      <arg choice="plain"><replaceable>STATE</replaceable></arg>
+    </cmdsynopsis>
   </refsynopsisdiv>
 
   <refsect1>
@@ -139,7 +145,8 @@
     <para><command>systemd-analyze</command> may be used to determine
     system boot-up performance statistics and retrieve other state and
     tracing information from the system and service manager, and to
-    verify the correctness of unit files.</para>
+    verify the correctness of unit files. It is also used to access
+    special functions useful for advanced system manager debugging.</para>
 
     <para><command>systemd-analyze time</command> prints the time
     spent in the kernel before userspace has been reached, the time
@@ -232,6 +239,13 @@
     syntax described in
     <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
 
+    <para><command>systemd-analyze service-watchdogs
+    <replaceable>STATE</replaceable></command> globally enables or disables the service
+    runtime watchdogs (<option>WatchdogSec=</option>) and emergency actions (e.g.
+    <option>OnFailure=</option> or <option>StartLimitAction=</option>); see
+    <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+    The hardware watchdog is not affected by this setting.</para>
+
     <para>If no command is passed, <command>systemd-analyze
     time</command> is implied.</para>
 

diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index dce6dd6..4611044 100644 (file)
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -1521,6 +1521,39 @@ static int test_calendar(int argc, char *argv[], void *userdata) {
         return ret;
 }
 
+static int service_watchdogs(int argc, char *argv[], void *userdata) {
+        _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
+        int b, r;
+
+        assert(argc == 2);
+        assert(argv);
+
+        b = parse_boolean(argv[1]);
+        if (b < 0) {
+                log_error("Failed to parse service-watchdogs argument.");
+                return -EINVAL;
+        }
+
+        r = acquire_bus(false, &bus);
+        if (r < 0)
+                return log_error_errno(r, "Failed to create bus connection: %m");
+
+        r = sd_bus_set_property(
+                        bus,
+                        "org.freedesktop.systemd1",
+                        "/org/freedesktop/systemd1",
+                        "org.freedesktop.systemd1.Manager",
+                        "ServiceWatchdogs",
+                        &error,
+                        "b",
+                        b);
+        if (r < 0)
+                return log_error_errno(r, "Failed to issue method call: %s", bus_error_message(&error, r));
+
+        return 0;
+}
+
 static int do_verify(int argc, char *argv[], void *userdata) {
         return verify_units(strv_skip(argv, 1),
                             arg_user ? UNIT_FILE_USER : UNIT_FILE_SYSTEM,
@@ -1563,6 +1596,7 @@ static int help(int argc, char *argv[], void *userdata) {
                "  syscall-filter [NAME...] Print list of syscalls in seccomp filter\n"
                "  verify FILE...           Check unit files for correctness\n"
                "  calendar SPEC...         Validate repetitive calendar time events\n"
+               "  service-watchdogs on/off Enable/disable service watchdogs\n"
                , program_invocation_short_name);
 
         /* When updating this list, including descriptions, apply
@@ -1708,20 +1742,21 @@ static int parse_argv(int argc, char *argv[]) {
 int main(int argc, char *argv[]) {
 
         static const Verb verbs[] = {
-                { "help",           VERB_ANY, VERB_ANY, 0,            help                   },
-                { "time",           VERB_ANY, 1,        VERB_DEFAULT, analyze_time           },
-                { "blame",          VERB_ANY, 1,        0,            analyze_blame          },
-                { "critical-chain", VERB_ANY, VERB_ANY, 0,            analyze_critical_chain },
-                { "plot",           VERB_ANY, 1,        0,            analyze_plot           },
-                { "dot",            VERB_ANY, VERB_ANY, 0,            dot                    },
-                { "set-log-level",  2,        2,        0,            set_log_level          },
-                { "get-log-level",  VERB_ANY, 1,        0,            get_log_level          },
-                { "set-log-target", 2,        2,        0,            set_log_target         },
-                { "get-log-target", VERB_ANY, 1,        0,            get_log_target         },
-                { "dump",           VERB_ANY, 1,        0,            dump                   },
-                { "syscall-filter", VERB_ANY, VERB_ANY, 0,            dump_syscall_filters   },
-                { "verify",         2,        VERB_ANY, 0,            do_verify              },
-                { "calendar",       2,        VERB_ANY, 0,            test_calendar          },
+                { "help",              VERB_ANY, VERB_ANY, 0,            help                   },
+                { "time",              VERB_ANY, 1,        VERB_DEFAULT, analyze_time           },
+                { "blame",             VERB_ANY, 1,        0,            analyze_blame          },
+                { "critical-chain",    VERB_ANY, VERB_ANY, 0,            analyze_critical_chain },
+                { "plot",              VERB_ANY, 1,        0,            analyze_plot           },
+                { "dot",               VERB_ANY, VERB_ANY, 0,            dot                    },
+                { "set-log-level",     2,        2,        0,            set_log_level          },
+                { "get-log-level",     VERB_ANY, 1,        0,            get_log_level          },
+                { "set-log-target",    2,        2,        0,            set_log_target         },
+                { "get-log-target",    VERB_ANY, 1,        0,            get_log_target         },
+                { "dump",              VERB_ANY, 1,        0,            dump                   },
+                { "syscall-filter",    VERB_ANY, VERB_ANY, 0,            dump_syscall_filters   },
+                { "verify",            2,        VERB_ANY, 0,            do_verify              },
+                { "calendar",          2,        VERB_ANY, 0,            test_calendar          },
+                { "service-watchdogs", 2,        2,        0,            service_watchdogs      },
                 {}
         };