Skip to content

Commit

Permalink
ovn-controller: race between binding-run and patch-run for localnet p…
Browse files Browse the repository at this point in the history
…orts

when ctx->ovnsb_idl_txn is null, binding_run exits early
and does not add any local_datapaths, but patch_run
doesnt check this, and ends up deleting localnet ports,
because there are no local datapaths for them,
They get readded in a subsequent run causing unnecessary
deletion and readdition.

Signed-off-by: Ramu Ramamurthy <ramu.ramamurthy@us.ibm.com>
Signed-off-by: Russell Bryant <russell@ovn.org>
  • Loading branch information
shrek authored and russellb committed Mar 7, 2016
1 parent 8520dee commit 3a83007
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ovn/controller/patch.c
Expand Up @@ -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) {
if (!ctx->ovs_idl_txn || !ctx->ovnsb_idl_txn) {
return;
}

Expand Down

0 comments on commit 3a83007

Please sign in to comment.