From mboxrd@z Thu Jan 1 00:00:00 1970 From: pcaulfield@sourceware.org Date: 16 Oct 2006 14:10:22 -0000 Subject: [Cluster-devel] cluster/cman/daemon commands.c Message-ID: <20061016141022.7824.qmail@sourceware.org> List-Id: 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: pcaulfield at sourceware.org 2006-10-16 14:10:21 Modified files: cman/daemon : commands.c Log message: Sigh, got the condition back-to-front. This should fix the AISONLY status (again). Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/commands.c.diff?cvsroot=cluster&r1=1.52&r2=1.53 --- cluster/cman/daemon/commands.c 2006/10/10 15:14:53 1.52 +++ cluster/cman/daemon/commands.c 2006/10/16 14:10:21 1.53 @@ -1682,9 +1682,8 @@ /* This is the killer. If the join_time of the node matches that already stored AND the node has been down, then we kill it as this must be a rejoin */ if (msg->join_time == node->cman_join_time && node->flags & NODE_FLAGS_BEENDOWN) { - /* Don't duplicate messages */ - if (node->state == NODESTATE_AISONLY) { + if (node->state != NODESTATE_AISONLY) { if (cluster_is_quorate) { P_MEMB("Killing node %s because it has rejoined the cluster without cman_tool join", node->name); log_printf(LOG_CRIT, "Killing node %s because it has rejoined the cluster without cman_tool join", node->name);