From 9763d17fbd05baed54e284664023cccc448e1f2c Mon Sep 17 00:00:00 2001 From: Martin Xu Date: Mon, 30 Jul 2018 22:47:18 -0700 Subject: [PATCH] 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 CC: Greg Rose CC: Aaron Conole CC: Justin Pettit Signed-off-by: Ben Pfaff --- utilities/ovs-lib.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- 2.39.5