From 7491caa37f3bead9420e7fcc6a3e74b0ec18da00 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Mon, 30 Jul 2018 09:47:45 -0400 Subject: [PATCH] ovn: Modify restart_controller in ovn-ctl to use --restart 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 Signed-off-by: Ben Pfaff --- 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..296e5b82c 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 "$@" } 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 d6ef77b6e..f36bd0103 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 -- 2.39.5