[SCM] CTDB repository - branch master updated - ctdb-1.0.84-18-gfdf50f3

[Ronnie Sahlberg]

The branch, master has been updated
       via  fdf50f3e774e3980af81c0b6f4ff81d085f4f697 (commit)
      from  fc8a364eb095ec11ca01246a583bf1dc53510141 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit fdf50f3e774e3980af81c0b6f4ff81d085f4f697
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Fri Jun 19 15:55:13 2009 +1000

    dont log an error if waitpid returns -1 and errno is ECHILD

-----------------------------------------------------------------------

Summary of changes:
 server/ctdb_recoverd.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index 07f3f0d..3ab44a7 100644
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -3094,7 +3094,9 @@ static void recd_sig_child_handler(struct event_context *ev,
 	while (pid != 0) {
 		pid = waitpid(-1, &status, WNOHANG);
 		if (pid == -1) {
-			DEBUG(DEBUG_ERR, (__location__ " waitpid() returned error. errno:%d\n", errno));
+			if (errno != ECHILD) {
+				DEBUG(DEBUG_ERR, (__location__ " waitpid() returned error. errno:%s(%d)\n", strerror(errno),errno));
+			}
 			return;
 		}
 		if (pid > 0) {


-- 
CTDB repository