[ovs-dev] [PATCH] Revert "ovn-controller: race between binding-run and patch-run for localnet ports"

Ben Pfaff blp at ovn.org
Tue Mar 8 00:19:25 UTC 2016


Thanks, applied.

On Mon, Mar 07, 2016 at 06:42:18PM -0500, Russell Bryant wrote:
> Acked-by: Russell Bryant <russell at ovn.org>
> 
> On Monday, March 7, 2016, Ben Pfaff <blp at ovn.org> wrote:
> 
> > This reverts commit 3a83007a76bbf05144cee1fda7ad81c1c717dca7.  It's really
> > nonobvious from the code why the condition added by that commit makes
> > sense.
> > The new condition should not be necessary now that binding_run() always
> > keeps
> > track of the local datapaths, since commit 7c040135cf351 (binding: Track
> > local
> > datapaths even when no transaction is possible).
> >
> > CC: Ramu Ramamurthy <ramu.ramamurthy at gmail.com <javascript:;>>
> > Signed-off-by: Ben Pfaff <blp at ovn.org <javascript:;>>
> > ---
> >  ovn/controller/patch.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/ovn/controller/patch.c b/ovn/controller/patch.c
> > index cfae613..753ce3e 100644
> > --- a/ovn/controller/patch.c
> > +++ b/ovn/controller/patch.c
> > @@ -280,7 +280,7 @@ void
> >  patch_run(struct controller_ctx *ctx, const struct ovsrec_bridge *br_int,
> >            struct hmap *local_datapaths)
> >  {
> > -    if (!ctx->ovs_idl_txn || !ctx->ovnsb_idl_txn) {
> > +    if (!ctx->ovs_idl_txn) {
> >          return;
> >      }
> >
> > --
> > 2.1.3
> >
> > _______________________________________________
> > dev mailing list
> > dev at openvswitch.org <javascript:;>
> > http://openvswitch.org/mailman/listinfo/dev
> >
> 
> 
> -- 
> Russell Bryant



More information about the dev mailing list