[GitHub] [geode] pivotal-jbarrett commented on a diff in pull request #7665: GEODE-10281: Fix WAN data inconsistency

[GitBox <gi...@apache.org>]

pivotal-jbarrett commented on code in PR #7665:
URL: https://github.com/apache/geode/pull/7665#discussion_r869466833


##########
geode-core/build.gradle:
##########
@@ -375,6 +375,7 @@ dependencies {
 
 
   distributedTestImplementation(project(':geode-gfsh'))
+  distributedTestImplementation(project(':geode-wan'))

Review Comment:
   Since `geode-wan` was needed for these new distributed tests perhaps that is a sign the tests belong in `geode-wan`?



##########
geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java:
##########
@@ -853,7 +853,7 @@ public boolean shouldBeConflated() {
     // If the message is an update, it may be conflatable. If it is a
     // create, destroy, invalidate or destroy-region, it is not conflatable.
     // Only updates are conflated.
-    return isUpdate();
+    return isUpdate() && !isConcurrencyConflict();

Review Comment:
   There should be a unit test for this change.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscribe@geode.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org