[ https://issues.apache.org/jira/browse/GEODE-8302?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17155739#comment-17155739 ]
ASF subversion and git services commented on GEODE-8302: -------------------------------------------------------- Commit 8c35d9cd4ff22df9c5f6dd44735e48dabac0f56e in geode's branch refs/heads/develop from Alberto Gomez [ https://gitbox.apache.org/repos/asf?p=geode.git;h=8c35d9c ] GEODE-8302: Fixed 'events not queued conflated' stats when group-tran… (#5313) * GEODE-8302: Fixed 'events not queued conflated' stats when group-transaction-events is true Batch conflation is not compatible with group-transaction-events. It must be prevented that both are enabled at the same time for a given gateway sender. * GEODE-8302: Add extra checks in propagation with HA tests and add fix in conflation stats * GEODE-8302: Update GatewaySenderFactory javadoc Added information about incompatibility between group-transaction-events and enable-batch-conflation. * GEODE-8302: Doc changes after review * GEODE-8302: Fix for failing testReplicatedSerialPropagationHAWithGroupTransactionEvents * GEODE-8302: doc and error messages changes after review * GEODE-8302: Fix failing test case and possibly fix GEODE-8320 > WAN Conflation stats are being incorrectly incremented > ------------------------------------------------------ > > Key: GEODE-8302 > URL: https://issues.apache.org/jira/browse/GEODE-8302 > Project: Geode > Issue Type: Bug > Components: statistics, wan > Affects Versions: 1.14.0 > Reporter: Donal Evans > Assignee: Alberto Gomez > Priority: Major > > When the below diff (which adds checks to confirm that conflation stats are > not incremented in WAN tests with conflation disabled) is applied, the > modified tests fail due to conflation stats being incorrectly incremented. > This behaviour is only observed since the changes included in this PR were > introduced: https://github.com/apache/geode/pull/4928 > {noformat} > diff --git > a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java > > b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java > index b2ed76728f..bc6beb0002 100644 > --- > a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java > +++ > b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java > @@ -209,6 +209,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase { > > vm4.invoke(() -> WANTestBase.checkQueueStats("ln", 0, entries, entries, > entries)); > vm4.invoke(() -> WANTestBase.checkBatchStats("ln", 1, true)); > + vm4.invoke(() -> WANTestBase.checkConflatedStats("ln", 0)); > > // wait until queue is empty > vm5.invoke(() -> await() > @@ -354,6 +355,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase { > > vm4.invoke(() -> WANTestBase.checkQueueStats("ln", 0, entries, entries, > entries)); > vm4.invoke(() -> WANTestBase.checkBatchStats("ln", 2, true, true)); > + vm4.invoke(() -> WANTestBase.checkConflatedStats("ln", 0)); > > // wait until queue is empty > vm5.invoke(() -> await() > {noformat} > In addition to the tests above, > SerialWANPropagation_PartitionedRegionDUnitTest.testPartitionedSerialPropagationHA() > fails with incorrectly incremented conflation stats if a similar check is > introduced at the end of the test. Again, without the changes introduced by > PR #4928, this modified test passes. -- This message was sent by Atlassian Jira (v8.3.4#803005)