ctdb-daemon: Log when removing stale Unix domain socket

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12287

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Thu Sep 22 12:28:12 CEST 2016 on sn-devel-144

diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index 82a203b5366c344aefa9dc3d2d10d560f686429e..fc1ce275244a94b3ad4dec15808bfef11c1755ad 100644 (file)
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -1008,7 +1008,15 @@ static int ux_socket_bind(struct ctdb_context *ctdb)
        strncpy(addr.sun_path, ctdb->daemon.name, sizeof(addr.sun_path)-1);
 
        /* Remove any old socket */
-       unlink(ctdb->daemon.name);
+       ret = unlink(ctdb->daemon.name);
+       if (ret == 0) {
+               DEBUG(DEBUG_WARNING,
+                     ("Removed stale socket %s\n", ctdb->daemon.name));
+       } else if (errno != ENOENT) {
+               DEBUG(DEBUG_ERR,
+                     ("Failed to remove stale socket %s\n", ctdb->daemon.name));
+               return -1;
+       }
 
        set_close_on_exec(ctdb->daemon.sd);