proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-30 02:49:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: add "--with-service-timeout" in configure.ac

Browse Source 
On lower CPU with lots of static routes, it will cost more than 2
minutes.

2 minutes is the default timeout value, we can adjust it by configure:
./configure --with-service-timeout=<digit>

Signed-off-by: anlan_cs <anlan_cs@tom.com>
This commit is contained in:
anlan_cs 2021-12-30 00:17:05 -05:00
parent 5086cc1c66
commit fc539216ce
4 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -661,6 +661,8 @@ AC_ARG_ENABLE([ospfclient],
(this is the default if --disable-ospfapi is set)])) (this is the default if --disable-ospfapi is set)]))
AC_ARG_ENABLE([multipath], AC_ARG_ENABLE([multipath],
AS_HELP_STRING([--enable-multipath=ARG], [enable multipath function, ARG must be digit])) AS_HELP_STRING([--enable-multipath=ARG], [enable multipath function, ARG must be digit]))
AC_ARG_WITH([service_timeout],
AS_HELP_STRING([--with-service-timeout=ARG], [set service timeout value (2 minutes by default), ARG must be digit]))
AC_ARG_ENABLE([user], AC_ARG_ENABLE([user],
AS_HELP_STRING([--enable-user=USER], [user to run FRR suite as (default frr)])) AS_HELP_STRING([--enable-user=USER], [user to run FRR suite as (default frr)]))
AC_ARG_ENABLE([group], AC_ARG_ENABLE([group],
@ -932,6 +934,20 @@ AC_DEFINE_UNQUOTED([MULTIPATH_NUM], [$MPATH_NUM], [Maximum number of paths for a
AC_DEFINE_UNQUOTED([VTYSH_PAGER], ["$VTYSH_PAGER"], [What pager to use]) AC_DEFINE_UNQUOTED([VTYSH_PAGER], ["$VTYSH_PAGER"], [What pager to use])
TIMEOUT_MIN=2
case "${with_service_timeout}" in
[[1-9]|[1-9][0-9]|[1-9][0-9][0-9]])
TIMEOUT_MIN="${with_service_timeout}"
;;
0|"")
;;
*)
AC_MSG_FAILURE([Please specify digit for timeout ARG])
;;
esac
AC_SUBST([TIMEOUT_MIN])
dnl -------------------- dnl --------------------
dnl Enable code coverage dnl Enable code coverage
dnl -------------------- dnl --------------------

7
doc/user/installation.rst
View File

@ -273,6 +273,13 @@ options from the list below.
Build with FPM module support. Build with FPM module support.
.. option:: --with-service-timeout=X
Set timeout value for FRR service. The time of restarting or reloading FRR
service should not exceed this value. This number can be from 0-999.
Additionally if this parameter is not passed or setting X = 0, FRR will take
default value: 2 minutes.
.. option:: --enable-numeric-version .. option:: --enable-numeric-version
Alpine Linux does not allow non-numeric characters in the version string. Alpine Linux does not allow non-numeric characters in the version string.

2
tools/frr.service.in
View File

@ -12,7 +12,7 @@ Type=forking
NotifyAccess=all NotifyAccess=all
StartLimitInterval=3m StartLimitInterval=3m
StartLimitBurst=3 StartLimitBurst=3
TimeoutSec=2m TimeoutSec=@TIMEOUT_MIN@m
WatchdogSec=60s WatchdogSec=60s
RestartSec=5 RestartSec=5
Restart=on-abnormal Restart=on-abnormal

2
tools/frr@.service.in
View File

@ -12,7 +12,7 @@ Type=forking
NotifyAccess=all NotifyAccess=all
StartLimitInterval=3m StartLimitInterval=3m
StartLimitBurst=3 StartLimitBurst=3
TimeoutSec=2m TimeoutSec=@TIMEOUT_MIN@m
WatchdogSec=60s WatchdogSec=60s
RestartSec=5 RestartSec=5
Restart=on-abnormal Restart=on-abnormal