multipathd: open client socket early
authorMartin Wilck <mwilck@suse.com>
Fri, 2 Nov 2018 12:23:59 +0000 (13:23 +0100)
committerChristophe Varoqui <christophe.varoqui@opensvc.com>
Wed, 14 Nov 2018 07:22:25 +0000 (08:22 +0100)
Open the unix socket in multipathd code and pass the fd to
uxsock_listen(). This will enable us to make the main thread
wait for successful socket initialization in a follow-up patch.

Signed-off-by: Martin Wilck <mwilck@suse.com>
multipathd/main.c
multipathd/uxlsnr.c
multipathd/uxlsnr.h

index a022bdb..a91a14c 100644 (file)
@@ -66,6 +66,7 @@ static int use_watchdog;
 #include "pgpolicies.h"
 #include "uevent.h"
 #include "log.h"
+#include "uxsock.h"
 
 #include "mpath_cmd.h"
 #include "mpath_persist.h"
@@ -1496,12 +1497,24 @@ uevqloop (void * ap)
 static void *
 uxlsnrloop (void * ap)
 {
+       long ux_sock;
+
+       pthread_cleanup_push(rcu_unregister, NULL);
+       rcu_register_thread();
+
+       ux_sock = ux_socket_listen(DEFAULT_SOCKET);
+       if (ux_sock == -1) {
+               condlog(1, "could not create uxsock: %d", errno);
+               exit_daemon();
+               goto out;
+       }
+       pthread_cleanup_push(uxsock_cleanup, (void *)ux_sock);
+
        if (cli_init()) {
                condlog(1, "Failed to init uxsock listener");
-               return NULL;
+               exit_daemon();
+               goto out_sock;
        }
-       pthread_cleanup_push(rcu_unregister, NULL);
-       rcu_register_thread();
        set_handler_callback(LIST+PATHS, cli_list_paths);
        set_handler_callback(LIST+PATHS+FMT, cli_list_paths_fmt);
        set_handler_callback(LIST+PATHS+RAW+FMT, cli_list_paths_raw);
@@ -1556,8 +1569,12 @@ uxlsnrloop (void * ap)
        set_handler_callback(UNSETPRKEY+MAP, cli_unsetprkey);
 
        umask(077);
-       uxsock_listen(&uxsock_trigger, ap);
-       pthread_cleanup_pop(1);
+       uxsock_listen(&uxsock_trigger, ux_sock, ap);
+
+out_sock:
+       pthread_cleanup_pop(1); /* uxsock_cleanup */
+out:
+       pthread_cleanup_pop(1); /* rcu_unregister */
        return NULL;
 }
 
index 6f66666..773bc87 100644 (file)
@@ -165,24 +165,15 @@ void uxsock_cleanup(void *arg)
 /*
  * entry point
  */
-void * uxsock_listen(uxsock_trigger_fn uxsock_trigger, void * trigger_data)
+void * uxsock_listen(uxsock_trigger_fn uxsock_trigger, long ux_sock,
+                    void * trigger_data)
 {
-       long ux_sock;
        int rlen;
        char *inbuf;
        char *reply;
        sigset_t mask;
        int old_clients = MIN_POLLS;
 
-       ux_sock = ux_socket_listen(DEFAULT_SOCKET);
-
-       if (ux_sock == -1) {
-               condlog(1, "could not create uxsock: %d", errno);
-               exit_daemon();
-       }
-
-       pthread_cleanup_push(uxsock_cleanup, (void *)ux_sock);
-
        condlog(3, "uxsock: startup listener");
        polls = (struct pollfd *)MALLOC((MIN_POLLS + 1) * sizeof(struct pollfd));
        if (!polls) {
@@ -322,6 +313,5 @@ void * uxsock_listen(uxsock_trigger_fn uxsock_trigger, void * trigger_data)
                }
        }
 
-       pthread_cleanup_pop(1);
        return NULL;
 }
index d51a8f9..18f008d 100644 (file)
@@ -5,7 +5,8 @@
 
 typedef int (uxsock_trigger_fn)(char *, char **, int *, bool, void *);
 
-void * uxsock_listen(uxsock_trigger_fn uxsock_trigger,
-                    void * trigger_data);
+void uxsock_cleanup(void *arg);
+void *uxsock_listen(uxsock_trigger_fn uxsock_trigger, long ux_sock,
+                   void * trigger_data);
 
 #endif