This reverts commit 9b5422a98f817b9f2a1f8224cab7e1a8d0bbba1f.
Reason:
Calling 'ovs-appctl exit' on ovs-vswitchd will cause ovs-vswitchd
to destroy all the ports from the datapath. This is an unacceptable
behavior while restarting the daemons. Couple of reasons that come
to mind are:
1. Any configured ip addresses will be lost
2. Traffic will stop flowing.
Reported-by: Edgar Cantu <eoca...@us.ibm.com>
Signed-off-by: Gurucharan Shetty <g...@ovn.org>
---
AUTHORS | 1 +
utilities/ovs-lib.in | 9 +--------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 7ae64d3..a92b94f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -277,6 +277,7 @@ David Palma pa...@onesource.pt
Derek Cormier derek.corm...@lab.ntt.co.jp
Dhaval Badiani dbadi...@vmware.com
DK Moon dkm...@nicira.com
+Edgar Cantu eoca...@us.ibm.com
Edwin Chiu ec...@vmware.com
Eivind Bulie Haanaes
Eric Lopez elo...@nicira.com
diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in
index 773efb3..dd8a1e9 100644
--- a/utilities/ovs-lib.in
+++ b/utilities/ovs-lib.in
@@ -202,18 +202,11 @@ start_daemon () {
stop_daemon () {
if test -e "$rundir/$1.pid"; then
if pid=`cat "$rundir/$1.pid"`; then
- for action in EXIT .1 .25 .65 1 \
- TERM .1 .25 .65 1 1 1 1 \
- KILL 1 1 1 2 10 15 30 \
- FAIL; do
+ for action in TERM .1 .25 .65 1 1 1 1 KILL 1 1 1 2 10 15 30 FAIL;
do
if pid_exists "$pid" >/dev/null 2>&1; then :; else
return 0
fi
case $action in
- EXIT)
- action "Exiting $1 ($pid)" \
- ${bindir}/ovs-appctl -T 1 -t $rundir/$1.$pid.ctl
exit
- ;;
TERM)
action "Killing $1 ($pid)" kill $pid
;;
--
1.7.9.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
