Skip to content

Commit

Permalink
Revert "ovn-controller: race between binding-run and patch-run for lo…
Browse files Browse the repository at this point in the history
…calnet ports"

This reverts commit 3a83007.  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 <[email protected]>
Signed-off-by: Ben Pfaff <[email protected]>
Acked-by: Russell Bryant <[email protected]>
  • Loading branch information
blp committed Mar 8, 2016
1 parent bb33845 commit edc0a10
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ovn/controller/patch.c
Original file line number Diff line number Diff line change
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 || !ctx->ovnsb_idl_txn) {
if (!ctx->ovs_idl_txn) {
return;
}

Expand Down

0 comments on commit edc0a10

Please sign in to comment.