Răsfoiți Sursa

Fix problem in disallowed mode that prevented a HASSTATE node joining
a cluster without state or vice-versa
see Red Hat BZ#485026



git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1773 fd59a12c-fef9-0310-b244-a6a79926bd2f

Christine Caulfield 17 ani în urmă
părinte
comite
479eadbce1
1 a modificat fișierele cu 1 adăugiri și 1 ștergeri
  1. 1 1
      services/votequorum.c

+ 1 - 1
services/votequorum.c

@@ -1028,7 +1028,7 @@ static void message_handler_req_exec_quorum_nodeinfo (
 	/* Check flags for disallowed (if enabled) */
 	if (quorum_flags & VOTEQUORUM_FLAG_FEATURE_DISALLOWED) {
 		if ((req_exec_quorum_nodeinfo->flags & NODE_FLAGS_HASSTATE && node->flags & NODE_FLAGS_BEENDOWN) ||
-		    (req_exec_quorum_nodeinfo->flags & NODE_FLAGS_HASSTATE && req_exec_quorum_nodeinfo->first_trans && !(node->flags & NODE_FLAGS_US))) {
+		    (req_exec_quorum_nodeinfo->flags & NODE_FLAGS_HASSTATE && req_exec_quorum_nodeinfo->first_trans && !(node->flags & NODE_FLAGS_US) && (us->flags & NODE_FLAGS_HASSTATE))) {
 			if (node->state != NODESTATE_DISALLOWED) {
 				if (cluster_is_quorate) {
 					log_printf(LOG_CRIT, "Killing node %d because it has rejoined the cluster with existing state", node->node_id);