The branch, master has been updated
via 49fb663 ctdb-daemon: Remove stale eventd socket
from eaa508b ctdb-tests: Add "13.per_ip_routing shutdown" test
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 49fb663d6e48e9c8a4759cc4c68bc877c798c6c2
Author: Amitay Isaacs <[email protected]>
Date: Fri Jan 13 16:00:45 2017 +1100
ctdb-daemon: Remove stale eventd socket
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12513
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
Autobuild-User(master): Martin Schwenke <[email protected]>
Autobuild-Date(master): Tue Jan 17 15:00:15 CET 2017 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
ctdb/server/eventscript.c | 9 +++++++++
1 file changed, 9 insertions(+)
Changeset truncated at 500 lines:
diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c
index decbaa8..22cd873 100644
--- 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;
--
Samba Shared Repository
