Sfoglia il codice sorgente

SYNC: always call sync_aborted() in sync_confchg_fn().

1) sync_callbacks.sync_abort can be null.
2) sync_processing is set to 0 after syncv1 is done.
   Then syncv2 processing is down. If we get a config change
   after syncv1 is down, but before syncv2 is done then it won't
   get aborted.



git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2995 fd59a12c-fef9-0310-b244-a6a79926bd2f
Angus Salkeld 15 anni fa
parent
commit
0fab390ae4
1 ha cambiato i file con 1 aggiunte e 1 eliminazioni
  1. 1 1
      exec/sync.c

+ 1 - 1
exec/sync.c

@@ -471,8 +471,8 @@ static void sync_confchg_fn (
 	memcpy (my_member_list, member_list, member_list_entries * sizeof (unsigned int));
 	my_member_list_entries = member_list_entries;
 
+	sync_aborted ();
 	if (sync_processing && sync_callbacks.sync_abort != NULL) {
-		sync_aborted ();
 		sync_callbacks.sync_abort ();
 		sync_callbacks.sync_activate = NULL;
 	}