diff options
author | Martin Xu <martinxu9.ovs@gmail.com> | 2018-07-30 22:47:18 -0700 |
---|---|---|
committer | Ben Pfaff <blp@ovn.org> | 2018-07-31 13:54:50 -0700 |
commit | 9763d17fbd05baed54e284664023cccc448e1f2c (patch) | |
tree | 0ebfb428405d3adc9efe6ce65ed29523dc6c524f /utilities | |
parent | 7539bfafac64b99ac3ffed1c40a95b9e8b38cee0 (diff) | |
download | openvswitch-9763d17fbd05baed54e284664023cccc448e1f2c.tar.gz |
utilities: check datapath exists before conntrack flush
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>
Diffstat (limited to 'utilities')
-rw-r--r-- | utilities/ovs-lib.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in index 92f98ad92..d6ef77b6e 100644 --- a/utilities/ovs-lib.in +++ b/utilities/ovs-lib.in @@ -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 |