[jboss-jira] [JBoss JIRA] (JGRP-1379) Make merging more scalable / robust

Make merging more scalable / robust ----------------------------------- Key: JGRP-1379 URL: https://issues.jboss.org/browse/JGRP-1379 Project: JGroups Issue Type: Task Reporter: Bela Ban Assignee: Bela Ban Fix For: 3.0 Make the MERGE2/GMS/Merger code more robust and scale better in large clusters. - While a merge is going on, stop sending out discovery requests. This reduces unnecessary traffic, especially in large clusters where discovery responses include the entire view of a sub-cluster - If we start a merge, or receive a MERGE-REQUEST, start a timer which cancels the merge after <merge_timeout *2> milliseconds. This is similar to the MergeKiller code, and prevents stale merges, e.g. by a crashed merge leader - Instead of cancelling a merge on reception of a MERGE_REJECTED response from P, simply exclude P from the merge. This way, we'll have fewer merge cancellations