Revert "ovn-controller: race between binding-run and patch-run for localnet ports"
authorBen Pfaff <blp@ovn.org>
Mon, 7 Mar 2016 22:58:25 +0000 (14:58 -0800)
committerBen Pfaff <blp@ovn.org>
Tue, 8 Mar 2016 00:18:44 +0000 (16:18 -0800)
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@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Russell Bryant <russell@ovn.org>
ovn/controller/patch.c

index cfae613..753ce3e 100644 (file)
@@ -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;
     }