[ovs-dev] [PATCH v2 2/2] ovn: Modify restart_controller in ovn-ctl to use --restart

Jakub Sitnicki jkbs at redhat.com
Tue Jul 31 08:27:59 UTC 2018


On Mon, 30 Jul 2018 09:47:45 -0400
Mark Michelson <mmichels at redhat.com> wrote:

> The --restart flag allows for uninterrupted packet flowage when exiting
> ovn-controller. This patch modifies the restart_controller argument to
> ovn-ctl to use --restart.
> 
> Signed-off-by: Mark Michelson <mmichels at redhat.com>
> ---
>  ovn/utilities/ovn-ctl | 4 ++--
>  utilities/ovs-lib.in  | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/ovn/utilities/ovn-ctl b/ovn/utilities/ovn-ctl
> index 2fce47714..05feed2b6 100755
> --- a/ovn/utilities/ovn-ctl
> +++ b/ovn/utilities/ovn-ctl
> @@ -350,7 +350,7 @@ stop_northd () {
>  }
>  
>  stop_controller () {
> -    OVS_RUNDIR=${OVN_RUNDIR} stop_daemon ovn-controller
> +    OVS_RUNDIR=${OVN_RUNDIR} stop_daemon ovn-controller $@
>  }

It needs to be "$@" or the arguments containing whitespace (or
characters from IFS) will get split up :-C

>  
>  stop_controller_vtep () {
> @@ -367,7 +367,7 @@ restart_northd () {
>  }
>  
>  restart_controller () {
> -    stop_controller
> +    stop_controller --restart
>      start_controller
>  }
>  
> diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in
> index 92f98ad92..9f62dfd25 100644
> --- a/utilities/ovs-lib.in
> +++ b/utilities/ovs-lib.in
> @@ -258,7 +258,7 @@ stop_daemon () {
>                  case $action in
>                      EXIT)
>                          action "Exiting $1 ($pid)" \
> -                            ${bindir}/ovs-appctl -T 1 -t $rundir/$1.$pid.ctl exit
> +                            ${bindir}/ovs-appctl -T 1 -t $rundir/$1.$pid.ctl exit $2
>                          ;;
>                      TERM)
>                          action "Killing $1 ($pid)" kill $pid



More information about the dev mailing list