| Message ID | 1602579843-28275-1-git-send-email-dceara@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] ofctrl.c: Always log the most recent flow changes. | expand |
On Tue, Oct 13, 2020 at 2:04 AM Dumitru Ceara <dceara@redhat.com> wrote: > Fixes: 6f0b1e02d9ab ("ofctrl: Incremental processing for flow installation > by tracking.") > Signed-off-by: Dumitru Ceara <dceara@redhat.com> > --- > 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 > > Thanks Dumitru. I applied it to master.
On 10/13/20 8:27 PM, Han Zhou wrote: > > > On Tue, Oct 13, 2020 at 2:04 AM Dumitru Ceara <dceara@redhat.com > <mailto:dceara@redhat.com>> wrote: > > Fixes: 6f0b1e02d9ab ("ofctrl: Incremental processing for flow installation > by tracking.") > Signed-off-by: Dumitru Ceara <dceara@redhat.com <mailto:dceara@redhat.com>> > --- > 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 > > Thanks Dumitru. I applied it to master. Thanks!
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. */
Fixes: 6f0b1e02d9ab ("ofctrl: Incremental processing for flow installation by tracking.") Signed-off-by: Dumitru Ceara <dceara@redhat.com> --- controller/ofctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)