[ https://issues.apache.org/jira/browse/GEODE-8302?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17154731#comment-17154731 ]
ASF GitHub Bot commented on GEODE-8302: --------------------------------------- alb3rtobr commented on pull request #5313: URL: https://github.com/apache/geode/pull/5313#issuecomment-656236457 @nabarunnag I agree that is not recommended to include more than one ticket solution in the same commit, but in this case one ticket is a subset of the other one. Luckily Alberto has solved the bigger one, that as a side effect solves the other. Or even you can think that it is invalidating the other one, as it cannot be reproduced after merging GEODE-8302. Anyway independently of the decision taken, GEODE-8302 can be merged into develop if there is no other problem with the review. Then Alberto could prepare a separate PR with the code of GEODE-8320 that will result on an empty commit in develop because the code is already there. ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > 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)