From 814f6acbce556e3d580c9bd7d2f69be573375cfd Mon Sep 17 00:00:00 2001 From: Dumitru Ceara Date: Tue, 13 Oct 2020 11:04:03 +0200 Subject: [PATCH 6/7] ofctrl.c: Always log the most recent flow changes. Fixes: 6f0b1e02d9ab ("ofctrl: Incremental processing for flow installation by tracking.") Signed-off-by: Dumitru Ceara Signed-off-by: Han Zhou (cherry picked from upstream commit 33c15c145988daa6172928dc870f3a0225515f50) Change-Id: I17cd01e6a0924c1f52b2d9ae4b15f8e6438b10d5 --- controller/ofctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controller/ofctrl.c b/controller/ofctrl.c index ba0c61c..f444cae 100644 --- a/controller/ofctrl.c +++ b/controller/ofctrl.c @@ -1894,8 +1894,8 @@ update_installed_flows_by_track(struct ovn_desired_flow_table *flow_table, * installed flow, so update the OVS flow for the new * active flow (at least the cookie will be different, * even if the actions are the same). */ - ovn_flow_log(&i->flow, "updating installed (tracked)"); installed_flow_mod(&i->flow, &d->flow, msgs); + ovn_flow_log(&i->flow, "updating installed (tracked)"); } } desired_flow_destroy(f); @@ -1915,8 +1915,8 @@ update_installed_flows_by_track(struct ovn_desired_flow_table *flow_table, } else if (installed_flow_get_active(i) == f) { /* The installed flow is installed for f, but f has change * tracked, so it must have been modified. */ - ovn_flow_log(&i->flow, "updating installed (tracked)"); installed_flow_mod(&i->flow, &f->flow, msgs); + ovn_flow_log(&i->flow, "updating installed (tracked)"); } else { /* Adding a new flow that conflicts with an existing installed * flow, so just add it to the link. */ -- 1.8.3.1