sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

ctdb-daemon: Do not retry connection to eventd

Browse Source 
Confirmation is now received from eventd that it is accepting
connections, so this is no longer needed.

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

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2018-08-27 14:53:37 +10:00 committed by Amitay Isaacs
parent 62ec1ab147
commit b430a1ace6
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ctdb/server/eventscript.c
View File

@ -219,7 +219,7 @@ int ctdb_start_eventd(struct ctdb_context *ctdb)
const char **argv;
int fd[2];
pid_t pid;
int ret, i;
int ret;
bool status;
if (ctdb->ectx == NULL) {
@ -306,17 +306,9 @@ int ctdb_start_eventd(struct ctdb_context *ctdb)
tevent_fd_set_auto_close(ectx->eventd_fde);
ectx->eventd_pid = pid;
/* Wait to connect to eventd */
for (i=0; i<10; i++) {
status = eventd_client_connect(ectx);
if (status) {
break;
}
sleep(1);
}
status = eventd_client_connect(ectx);
if (! status) {
DEBUG(DEBUG_ERR, ("Failed to initialize event daemon\n"));
DEBUG(DEBUG_ERR, ("Failed to connect to event daemon\n"));
ctdb_stop_eventd(ctdb);
return -1;
}