[ovs-dev,09/23] patch: Bail out earlier if OVS IDL transactions cannot be executed.
diff mbox

Message ID 1444450544-11845-10-git-send-email-blp@nicira.com
State Accepted
Headers show

Commit Message

Ben Pfaff Oct. 10, 2015, 4:15 a.m. UTC
The whole point of this module is side effects on the Open vSwitch
database, so the whole thing can be skipped if those are impossible.

Signed-off-by: Ben Pfaff <blp@nicira.com>
---
 ovn/controller/patch.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Justin Pettit Oct. 15, 2015, 9:17 p.m. UTC | #1
> On Oct 9, 2015, at 9:15 PM, Ben Pfaff <blp@nicira.com> wrote:
> 
> The whole point of this module is side effects on the Open vSwitch
> database, so the whole thing can be skipped if those are impossible.
> 
> Signed-off-by: Ben Pfaff <blp@nicira.com>

Acked-by: Justin Pettit <jpettit@nicira.com>

--Justin

Patch
diff mbox

diff --git a/ovn/controller/patch.c b/ovn/controller/patch.c
index 0d192fa..1cce559 100644
--- a/ovn/controller/patch.c
+++ b/ovn/controller/patch.c
@@ -69,10 +69,6 @@  create_patch_port(struct controller_ctx *ctx,
                   const struct ovsrec_bridge *b1,
                   const struct ovsrec_bridge *b2)
 {
-    if (!ctx->ovs_idl_txn) {
-        return;
-    }
-
     char *port_name = patch_port_name(b1, b2);
     char *peer_port_name = patch_port_name(b2, b1);
 
@@ -218,6 +214,10 @@  parse_bridge_mappings(struct controller_ctx *ctx,
 void
 patch_run(struct controller_ctx *ctx, const struct ovsrec_bridge *br_int)
 {
+    if (!ctx->ovs_idl_txn) {
+        return;
+    }
+
     const char *mappings_cfg = "";
     const struct ovsrec_open_vswitch *cfg;