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 <[email protected]> Signed-off-by: Ben Pfaff <[email protected]>
qihuaheng · Aug 2, 2018 · 7491caa · 7491caa
1 parent 96ea0ec
commit 7491caa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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