Feature: stonith_admin: add --delay option to support enforced fencing delay

It can be specified with --fence, --reboot or --unfence commands.
The default value -1 disables enforced fencing delay.

Author: gao-yan

include/pcmki/pcmki_fence.h

@@ -26,11 +26,13 @@
  * \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.
  *
  * \return Standard Pacemaker return code
  */
 int pcmk__fence_action(stonith_t *st, const char *target, const char *action,
-                      const char *name, unsigned int timeout, unsigned int tolerance);
+                       const char *name, unsigned int timeout, unsigned int tolerance,
+                       int delay);
 
 /*!
  * \brief List the fencing operations that have occurred for a specific node.

lib/pacemaker/pcmk_fence.c

@@ -30,6 +30,7 @@ static struct {
     char *name;
     unsigned int timeout;
     unsigned int tolerance;
+    int delay;
     int rc;
 } async_fence_data;
 
@@ -109,12 +110,13 @@ async_fence_helper(gpointer user_data)
 
     st->cmds->register_notification(st, T_STONITH_NOTIFY_FENCE, notify_callback);
 
-    call_id = st->cmds->fence(st,
-                              st_opt_allow_suicide,
-                              async_fence_data.target,
-                              async_fence_data.action,
-                              async_fence_data.timeout/1000,
-                              async_fence_data.tolerance/1000);
+    call_id = st->cmds->fence_with_delay(st,
+                                         st_opt_allow_suicide,
+                                         async_fence_data.target,
+                                         async_fence_data.action,
+                                         async_fence_data.timeout/1000,
+                                         async_fence_data.tolerance/1000,
+                                         async_fence_data.delay);
 
     if (call_id < 0) {
         g_main_loop_quit(mainloop);
@@ -131,7 +133,8 @@ async_fence_helper(gpointer user_data)
 
 int
 pcmk__fence_action(stonith_t *st, const char *target, const char *action,
-                   const char *name, unsigned int timeout, unsigned int tolerance)
+                   const char *name, unsigned int timeout, unsigned int tolerance,
+                   int delay)
 {
     crm_trigger_t *trig;
 
@@ -141,6 +144,7 @@ pcmk__fence_action(stonith_t *st, const char *target, const char *action,
     async_fence_data.action = action;
     async_fence_data.timeout = timeout;
     async_fence_data.tolerance = tolerance;
+    async_fence_data.delay = delay;
     async_fence_data.rc = pcmk_err_generic;
 
     trig = mainloop_add_trigger(G_PRIORITY_HIGH, async_fence_helper, NULL);
@@ -157,8 +161,10 @@ pcmk__fence_action(stonith_t *st, const char *target, const char *action,
 #ifdef BUILD_PUBLIC_LIBPACEMAKER
 int
 pcmk_fence_action(stonith_t *st, const char *target, const char *action,
-                  const char *name, unsigned int timeout, unsigned int tolerance) {
-    return pcmk__fence_action(st, target, action, name, timeout, tolerance);
+                  const char *name, unsigned int timeout, unsigned int tolerance,
+                  int delay)
+{
+    return pcmk__fence_action(st, target, action, name, timeout, tolerancei, delay);
 }
 #endif
 

tools/stonith_admin.c

@@ -54,6 +54,7 @@ struct {
     int fence_level;
     int timeout ;
     int tolerance;
+    int delay;
     char *agent;
     char *confirm_host;
     char *fence_host;
@@ -69,7 +70,8 @@ struct {
     char *unregister_dev;
     char *unregister_level;
 } options = {
-    .timeout = 120
+    .timeout = 120,
+    .delay = -1
 };
 
 gboolean add_env_params(const gchar *option_name, const gchar *optarg, gpointer data, GError **error);
@@ -205,6 +207,10 @@ static GOptionEntry addl_entries[] = {
       "Operation timeout in seconds (default 120;\n"
       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).",
+      "SECONDS" },
     { "as-node-id", 'n', 0, G_OPTION_ARG_NONE, &options.as_nodeid,
       "(Advanced) The supplied node is the corosync node ID\n"
       INDENT "(with --last).",
@@ -560,17 +566,17 @@ main(int argc, char **argv)
 
         case 'B':
             rc = pcmk__fence_action(st, target, "reboot", name, options.timeout*1000,
-                                      options.tolerance*1000);
+                                    options.tolerance*1000, options.delay);
             break;
 
         case 'F':
             rc = pcmk__fence_action(st, target, "off", name, options.timeout*1000,
-                                      options.tolerance*1000);
+                                    options.tolerance*1000, options.delay);
             break;
 
         case 'U':
             rc = pcmk__fence_action(st, target, "on", name, options.timeout*1000,
-                                      options.tolerance*1000);
+                                    options.tolerance*1000, options.delay);
             break;
 
         case 'h':