Conflict resolution should utilise Merkle trees to improve performance ---------------------------------------------------------------------- Key: ISPN-8412 URL: https://issues.redhat.com/browse/ISPN-8412 Project: Infinispan Issue Type: Enhancement Components: Core, State Transfer Affects Versions: 9.2.0.Alpha1 Reporter: Ryan Emerson Assignee: Ryan Emerson Priority: Major Fix For: 12.0.0.Final Currently we detect conflicts between CacheEntry replicas by retrieving all entries for a cache segment and comparing their values on the node initiating the conflict resolution. This does not scale. Instead, we should generate a Merkle tree for each segment on the replica nodes. When initiating conflict resolution, it is then possible to retrieve a segments hash from each of its owners and determine if a conflict is present before requesting the conflicting entries.