Skip to content

Commit e6beace

Browse files
committed
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.
1 parent 98a5ae1 commit e6beace

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

fencing/admin.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,10 @@ static struct crm_option long_options[] = {
177177
"\t\t\tused with most commands)."
178178
},
179179
{ "delay", required_argument, NULL, 'y',
180-
"Enforced fencing delay in seconds (default -1 (disabled);\n"
181-
"\t\t\twith --fence, --reboot, --unfence)."
180+
"Apply a fencing delay in seconds. Any static/random delays from\n"
181+
"\t\t\tpcmk_delay_base/max will be added, otherwise all\n"
182+
"\t\t\tdisabled with the value -1\n"
183+
"\t\t\t(default 0; with --fence, --reboot, --unfence)."
182184
},
183185
{ "as-node-id", no_argument, NULL, 'n',
184186
"(Advanced) The supplied node is the corosync node ID\n"
@@ -501,7 +503,7 @@ main(int argc, char **argv)
501503
int verbose = 0;
502504
int argerr = 0;
503505
int timeout = 120;
504-
int delay = -1;
506+
int delay = 0;
505507
int option_index = 0;
506508
int fence_level = 0;
507509
int no_connect = 0;

0 commit comments

Comments
 (0)