From edc0a10742f470b3444fe2a9f206565dc2c7eda7 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 7 Mar 2016 14:58:25 -0800 Subject: [PATCH] Revert "ovn-controller: race between binding-run and patch-run for localnet ports" 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 Signed-off-by: Ben Pfaff Acked-by: Russell Bryant --- 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 cfae613e7..753ce3ec4 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.20.1