Feature: stonith_admin: --delay option defaults to 0

This commit also documents the current behavior in the help:

- Any static/random delays from pcmk_delay_base/max will be added to
requested fencing delay.

- A delay value -1 now means disable also any static/random fencing
delays from pcmk_delay_base/max.

Author: gao-yan

include/pcmki/pcmki_fence.h

@@ -26,7 +26,8 @@
  * \param[in] tolerance If a successful action for \p target happened within
  *                      this many ms, return 0 without performing the action
  *                      again.
- * \param[in] delay     Enforce a fencing delay. Value -1 means disabled.
+ * \param[in] delay     Apply a fencing delay. Value -1 means disable also any
+ *                      static/random fencing delays from pcmk_delay_base/max
  *
  * \return Standard Pacemaker return code
  */

tools/stonith_admin.c

@@ -71,7 +71,7 @@ struct {
     char *unregister_level;
 } options = {
     .timeout = 120,
-    .delay = -1
+    .delay = 0
 };
 
 gboolean add_env_params(const gchar *option_name, const gchar *optarg, gpointer data, GError **error);
@@ -208,8 +208,10 @@ static GOptionEntry addl_entries[] = {
       INDENT "used with most commands).",
       "SECONDS" },
     { "delay", 'y', 0, G_OPTION_ARG_INT, &options.delay,
-      "Enforced fencing delay in seconds (default -1 (disabled);\n"
-      INDENT "with --fence, --reboot, --unfence).",
+      "Apply a fencing delay in seconds. Any static/random delays from\n"
+      INDENT "pcmk_delay_base/max will be added, otherwise all\n"
+      INDENT "disabled with the value -1\n"
+      INDENT "(default 0; with --fence, --reboot, --unfence).",
       "SECONDS" },
     { "as-node-id", 'n', 0, G_OPTION_ARG_NONE, &options.as_nodeid,
       "(Advanced) The supplied node is the corosync node ID\n"