From mboxrd@z Thu Jan  1 00:00:00 1970
From: teigland@sourceware.org <teigland@sourceware.org>
Date: 28 Sep 2006 19:26:46 -0000
Subject: [Cluster-devel] cluster/group/daemon cpg.c
Message-ID: <20060928192646.624.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2006-09-28 19:26:45

Modified files:
	group/daemon   : cpg.c 

Log message:
	put a message in syslog if we get a cpg error that we can't deal with

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/daemon/cpg.c.diff?cvsroot=cluster&r1=1.33&r2=1.34

--- cluster/group/daemon/cpg.c	2006/09/26 21:32:38	1.33
+++ cluster/group/daemon/cpg.c	2006/09/28 19:26:45	1.34
@@ -547,15 +547,14 @@
 
  retry:
 	error = cpg_mcast_joined(h, CPG_TYPE_AGREED, &iov, 1);
-	if (error != CPG_OK)
-		log_group(g, "cpg_mcast_joined error %d handle %llx", error, h);
 	if (error == CPG_ERR_TRY_AGAIN) {
 		retries++;
 		usleep(1000);
 		if (!(retries % 100))
 			log_error(g, "cpg_mcast_joined retry %d", retries);
 		goto retry;
-	}
+	} else if (error != CPG_OK)
+		log_error(g, "cpg_mcast_joined error %d handle %llx", error, h);
 
 	if (retries)
 		log_group(g, "cpg_mcast_joined retried %d", retries);