From: Numan Siddique <[email protected]>

ovn-nbctl when run as a daemon is creating the ctl socket in
the ovs rundir. This patch fixes this issue by creating it in
the ovn rundir.

Reported-by: Dan Williams <[email protected]>
Signed-off-by: Numan Siddique <[email protected]>
---
 utilities/ovn-nbctl.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/utilities/ovn-nbctl.c b/utilities/ovn-nbctl.c
index 59abe0051..412796e83 100644
--- a/utilities/ovn-nbctl.c
+++ b/utilities/ovn-nbctl.c
@@ -6436,7 +6436,19 @@ server_loop(struct ovsdb_idl *idl, int argc, char 
*argv[])
 
     service_start(&argc, &argv);
     daemonize_start(false);
-    int error = unixctl_server_create(unixctl_path, &server);
+
+    char *abs_unixctl_path = NULL;
+    if (!unixctl_path) {
+        abs_unixctl_path = get_abs_unix_ctl_path();
+    } else {
+        abs_unixctl_path = unixctl_path;
+    }
+
+    int error = unixctl_server_create(abs_unixctl_path, &server);
+    if (!unixctl_path) {
+        free(abs_unixctl_path);
+    }
+
     if (error) {
         ctl_fatal("failed to create unixctl server (%s)",
                   ovs_retval_to_string(error));
-- 
2.25.1

_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to