[JGRP-1282] - Race condition in FLUSH when master leaves cluster

belaban · Feb 8, 2011 · e319bb5 · e319bb5
1 parent c2832c5
commit e319bb5
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/src/org/jgroups/protocols/pbcast/FLUSH.java b/src/org/jgroups/protocols/pbcast/FLUSH.java
@@ -646,6 +646,9 @@ private void onSuspend(List<Address> members) {
             } else {
                 participantsInFlush = new ArrayList<Address>(currentView.getMembers());
             }
+            flushMembers.clear();
+            flushMembers.addAll(participantsInFlush);
+            flushMembers.removeAll(suspected);
             msg = new Message(null, localAddress, null);
             msg.putHeader(getName(), new FlushHeader(FlushHeader.START_FLUSH, currentViewId(),
                             participantsInFlush));
@@ -691,14 +694,18 @@ private void onStartFlush(Address flushStarter, FlushHeader fh) {
             numberOfFlushes += 1;
         }
         boolean proceed = false;
+        boolean amIFlushStarter = false;
         synchronized (sharedLock) {
-            flushCoordinator = flushStarter;
-            flushMembers.clear();
-            if (fh.flushParticipants != null) {
-                flushMembers.addAll(fh.flushParticipants);
+            amIFlushStarter = flushStarter.equals(localAddress);
+            if(!amIFlushStarter){
+               flushCoordinator = flushStarter;
+               flushMembers.clear();
+               if (fh.flushParticipants != null) {
+                   flushMembers.addAll(fh.flushParticipants);
+               }
+               flushMembers.removeAll(suspected);
             }
-            proceed = flushMembers.contains(localAddress);
-            flushMembers.removeAll(suspected);
+            proceed = flushMembers.contains(localAddress);            
         }
 
         if (proceed) {