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