If we're the coord, handle GMS.leave_timeout differently (https://iss…

…ues.jboss.org/browse/JGRP-1509)
belaban · Sep 11, 2012 · f1ffa33 · f1ffa33
1 parent 83aa131
commit f1ffa33
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/org/jgroups/protocols/pbcast/CoordGmsImpl.java b/src/org/jgroups/protocols/pbcast/CoordGmsImpl.java
@@ -55,7 +55,10 @@ public void leave(Address mbr) {
             leaving=true;
         gms.getViewHandler().add(new Request(Request.LEAVE, mbr, false));
         gms.getViewHandler().stop(true); // wait until all requests have been processed, then close the queue and leave
-        gms.getViewHandler().waitUntilCompleted(gms.leave_timeout);
+
+        // If we're the coord leaving, ignore gms.leave_timeout: https://issues.jboss.org/browse/JGRP-1509
+        long timeout=(long)(Math.max(gms.leave_timeout, gms.view_ack_collection_timeout) * 1.10);
+        gms.getViewHandler().waitUntilCompleted(timeout);
     }