]> git.proxmox.com Git - mirror_ovs.git/commitdiff
utilities: check datapath exists before conntrack flush
authorMartin Xu <martinxu9.ovs@gmail.com>
Tue, 31 Jul 2018 05:47:18 +0000 (22:47 -0700)
committerBen Pfaff <blp@ovn.org>
Tue, 31 Jul 2018 20:54:50 +0000 (13:54 -0700)
As part of "force-reload-kmod," conntrack flush command is issued as
'action "ovs-appctl dpctl/flush-conntrack"'. In case no datapath exists
yet when issuing "force-reload-kmod," there is an error message
"ovs-vswitchd: no datapaths exist\ ovs-appctl: ovs-vswitchd: server
returned an error", which is harmless but potentially shows up as "FAILED."
Add an if condition to check whether datapath exists before running the
conntrack flush command.

VMware-BZ: #2170402
Fixes: 265d70310c69 ("utilities: Fix conntrack flush command")
Signed-off-by: Martin Xu <martinxu9.ovs@gmail.com>
CC: Greg Rose <gvrose8192@gmail.com>
CC: Aaron Conole <aconole@redhat.com>
CC: Justin Pettit <jpettit@ovn.org>
Signed-off-by: Ben Pfaff <blp@ovn.org>
utilities/ovs-lib.in

index 92f98ad9228af4eb7b9c20bfc6c5837316bfd81e..d6ef77b6e3ddcee15ddeca8321fd920c73aac130 100644 (file)
@@ -605,7 +605,9 @@ force_reload_kmod () {
     stop_ovsdb
     start_ovsdb || return 1
 
-    action "Flush old conntrack entries" ovs-appctl dpctl/flush-conntrack
+    if [[ $(ovs-dpctl show) ]]; then
+        action "Flush old conntrack entries" ovs-appctl dpctl/flush-conntrack
+    fi
     stop_forwarding
 
     if action "Saving interface configuration" save_interfaces; then