ctdb-daemon: Remove stale eventd socket

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

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Tue Jan 17 15:00:15 CET 2017 on sn-devel-144

diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c
index decbaa8125b937b7c880449df606460bf1fef659..22cd8735a9d2dd39822e9df4f254399d37baed6f 100644 (file)
--- a/ctdb/server/eventscript.c
+++ b/ctdb/server/eventscript.c
@@ -171,6 +171,15 @@ int ctdb_start_eventd(struct ctdb_context *ctdb)
 
        ectx = ctdb->ectx;
 
+       ret = unlink(ectx->socket);
+       if (ret == 0) {
+               D_WARNING("Removed stale eventd socket %s\n", ectx->socket);
+       } else if (errno != ENOENT) {
+               D_ERR("Failed to remove stale eventd socket %s\n",
+                     ectx->socket);
+               return -1;
+       }
+
        argv = talloc_array(ectx, const char *, 14);
        if (argv == NULL) {
                return -1;