Просмотр исходного кода

votequorum: fix another regressions introduced by 05b4e99a6e (dispatch notifications only once)

left_member_entries is never set when totem config change is regular.

Reviewed-by: Steven Dake <sdake@redhat.com>
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Fabio M. Di Nitto 14 лет назад
Родитель
Сommit
620fcd147b
1 измененных файлов с 4 добавлено и 6 удалено
  1. 4 6
      services/votequorum.c

+ 4 - 6
services/votequorum.c

@@ -982,10 +982,6 @@ static void quorum_confchg_fn (
 
 	ENTER();
 
-	if (configuration_type != TOTEM_CONFIGURATION_REGULAR) {
-		return;
-	}
-
 	if (member_list_entries > 1) {
 		first_trans = 0;
 	}
@@ -1029,8 +1025,10 @@ static void quorum_confchg_fn (
 
 	memcpy(&quorum_ringid, ring_id, sizeof(*ring_id));
 
-	set_quorum(quorum_members, quorum_members_entries,
-		   cluster_is_quorate, &quorum_ringid);
+	if (configuration_type == TOTEM_CONFIGURATION_REGULAR) {
+		set_quorum(quorum_members, quorum_members_entries,
+			   cluster_is_quorate, &quorum_ringid);
+	}
 
 	LEAVE();
 }