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 <[email protected]> Signed-off-by: Ben Pfaff <[email protected]> --- 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 [email protected] http://openvswitch.org/mailman/listinfo/dev
