[ovs-dev] [PATCH 24/30] ovn-nbctl: Don't die in nbctl_lrp_set_gateway_chassis().

Jakub Sitnicki jkbs at redhat.com
Sat Jul 7 11:09:58 UTC 2018


Propagate the error via the context instead.

Signed-off-by: Jakub Sitnicki <jkbs at redhat.com>
---
 ovn/utilities/ovn-nbctl.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ovn/utilities/ovn-nbctl.c b/ovn/utilities/ovn-nbctl.c
index 7a38cea92..032dcd414 100644
--- a/ovn/utilities/ovn-nbctl.c
+++ b/ovn/utilities/ovn-nbctl.c
@@ -3309,10 +3309,11 @@ nbctl_lrp_set_gateway_chassis(struct ctl_context *ctx)
     const struct nbrec_logical_router_port *lrp;
     char *error = lrp_by_name_or_uuid(ctx, lrp_name, true, &lrp);
     if (error) {
-        ctl_fatal("%s", error);
+        ctx->error = error;
+        return;
     }
     if (!lrp) {
-        ctl_fatal("router port %s is required", lrp_name);
+        ctl_error(ctx, "router port %s is required", lrp_name);
         return;
     }
 
-- 
2.14.4



More information about the dev mailing list