Ben Pfaff <b...@ovn.org> wrote on 07/19/2016 12:57:23 AM:
> From: Ben Pfaff <b...@ovn.org>
> To: Ryan Moats/Omaha/IBM@IBMUS
> Cc: dev@openvswitch.org
> Date: 07/19/2016 12:57 AM
> Subject: Re: [ovs-dev, v23, 2/2] ovn-controller: Add incremental
> processing to lflow_run and physical_run
>
> On Mon, Jul 18, 2016 at 04:21:17PM -0500, Ryan Moats wrote:
> > This code changes to allow incremental processing of the
> > logical flow and physical binding tables whenver possible.
> >
> > Note: flows created by physical_run for multicast_groups are
> > *NOT* handled incrementally due to to be solved issues
> > with GWs and local routers.
> >
> > Signed-off-by: Ryan Moats <rmo...@us.ibm.com>
>
> With this applied, I get a number of apparently consistent test failures
> (literally no passes in 5+ runs) that I don't see, at least not
> consistently, if I revert it:
>
> OVN end-to-end tests
>
> 2106: ovn -- vtep: 3 HVs, 1 VIFs/HV, 1 GW, 1 LS FAILED
(ovn.at:1307)
> 2107: ovn -- 3 HVs, 1 VIFs/HV, 1 software GW, 1 LS FAILED
(ovn.at:1473)
> 2108: ovn -- 3 HVs, 3 LS, 3 lports/LS, 1 LR FAILED
(ovn.at:1887)
> 2110: ovn -- 2 HVs, 2 LS, 1 lport/LS, 2 peer LRs FAILED
(ovn.at:2416)
> 2115: ovn -- 2 HVs, 3 LRs connected via LS, static routes FAILED
> (ovn.at:3053)
>
> Do these pass reasonably often for you? (Maybe my changes to the
> previous patch screwed something up?)
>
First, not all of the above cases failed for me even with a rebase of the
last patch onto what is currently in master - the last two passed for me
on either the first and second run, so I'm looking at the first three for
the rest of this message.
Double checking by going back to my original first patch verified that all
of the tests in question passed. Going through and checking each of the
changes that you made to the first patch, the following is the diff I
needed
to make things work again:
diff --git a/ovn/controller/ofctrl.c b/ovn/controller/ofctrl.c
index d10dcc6..e113213 100644
--- a/ovn/controller/ofctrl.c
+++ b/ovn/controller/ofctrl.c
@@ -553,7 +553,10 @@ ofctrl_add_flow(uint8_t table_id, uint16_t priority,
ovn_flow_lookup(&match_flow_table, f, &existing);
struct ovn_flow *d;
LIST_FOR_EACH (d, list_node, &existing) {
- if (uuid_equals(&f->uuid, &d->uuid)) {
+ if (f->table_id == d->table_id && f->priority == d->priority
+ && ofpacts_equal(f->ofpacts, f->ofpacts_len,
+ d->ofpacts, d->ofpacts_len)
+ && uuid_equals(&f->uuid, &d->uuid)) {
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 1);
char *s = ovn_flow_to_string(f);
VLOG_WARN_RL(&rl, "found duplicate flow %s for parent
"UUID_FMT,
Hopefully that will get you past the test failures and you can push
both it and the rest of the last incremental processing patch.
Ryan
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
