proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 09:20:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

watchfrr: remove -z option

Browse Source 
Why would we not want to restart a daemon that's hanging?

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2017-06-01 14:19:09 +02:00
parent a8cbb8b383
commit 71e7975aaf
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
watchfrr/watchfrr.c
View File

@ -111,7 +111,6 @@ static struct global_state {
const char *start_command; const char *start_command;
const char *stop_command; const char *stop_command;
struct restart_info restart; struct restart_info restart;
int unresponsive_restart;
int loglevel; int loglevel;
struct daemon *special; /* points to zebra when doing phased restart */ struct daemon *special; /* points to zebra when doing phased restart */
int numdaemons; int numdaemons;
@ -170,7 +169,6 @@ static const struct option longopts[] = {
{"restart", required_argument, NULL, 'r'}, {"restart", required_argument, NULL, 'r'},
{"start-command", required_argument, NULL, 's'}, {"start-command", required_argument, NULL, 's'},
{"kill-command", required_argument, NULL, 'k'}, {"kill-command", required_argument, NULL, 'k'},
{"unresponsive-restart", no_argument, NULL, 'z'},
{"dry", no_argument, NULL, OPTION_DRY}, {"dry", no_argument, NULL, OPTION_DRY},
{"min-restart-interval", required_argument, NULL, OPTION_MINRESTART}, {"min-restart-interval", required_argument, NULL, OPTION_MINRESTART},
{"max-restart-interval", required_argument, NULL, OPTION_MAXRESTART}, {"max-restart-interval", required_argument, NULL, OPTION_MAXRESTART},
@ -237,9 +235,6 @@ Otherwise, the interval is doubled (but capped at the -M value).\n\n",
Supply a Bourne shell to command to use to stop a single\n\ Supply a Bourne shell to command to use to stop a single\n\
daemon. The command string should include '%%s' where the\n\ daemon. The command string should include '%%s' where the\n\
name of the daemon should be substituted.\n\ name of the daemon should be substituted.\n\
-z, --unresponsive-restart\n\
When a daemon is unresponsive, treat it as being down for\n\
restart purposes.\n\
--dry Do not start or restart anything, just log.\n\ --dry Do not start or restart anything, just log.\n\
-p, --pid-file Set process identifier file name\n\ -p, --pid-file Set process identifier file name\n\
(default is %s).\n\ (default is %s).\n\
@ -882,10 +877,8 @@ static int wakeup_no_answer(struct thread *t_wakeup)
"%s state -> unresponsive : no response yet to ping " "%s state -> unresponsive : no response yet to ping "
"sent %ld seconds ago", "sent %ld seconds ago",
dmn->name, gs.timeout); dmn->name, gs.timeout);
if (gs.unresponsive_restart) {
SET_WAKEUP_UNRESPONSIVE(dmn); SET_WAKEUP_UNRESPONSIVE(dmn);
try_restart(dmn); try_restart(dmn);
}
return 0; return 0;
} }
@ -990,7 +983,7 @@ int main(int argc, char **argv)
frr_preinit(&watchfrr_di, argc, argv); frr_preinit(&watchfrr_di, argc, argv);
progname = watchfrr_di.progname; progname = watchfrr_di.progname;
frr_opt_add("b:dk:l:i:p:r:S:s:t:T:z", longopts, ""); frr_opt_add("b:dk:l:i:p:r:S:s:t:T:", longopts, "");
gs.restart.name = "all"; gs.restart.name = "all";
while ((opt = frr_getopt(argc, argv, NULL)) != EOF) { while ((opt = frr_getopt(argc, argv, NULL)) != EOF) {
@ -1106,18 +1099,15 @@ int main(int argc, char **argv)
frr_help_exit(1); frr_help_exit(1);
} }
} break; } break;
case 'z':
gs.unresponsive_restart = 1;
break;
default: default:
fputs("Invalid option.\n", stderr); fputs("Invalid option.\n", stderr);
frr_help_exit(1); frr_help_exit(1);
} }
} }
if (watch_only && (gs.unresponsive_restart || gs.start_command if (watch_only
|| gs.stop_command || gs.restart_command)) { && (gs.start_command || gs.stop_command || gs.restart_command)) {
fputs("Options -z/-r/-s/-k make no sense combined with -D.\n", fputs("Options -r/-s/-k make no sense combined with -D.\n",
stderr); stderr);
frr_help_exit(1); frr_help_exit(1);
} }