[ https://issues.apache.org/jira/browse/GEODE-8302?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17153873#comment-17153873 ]
ASF GitHub Bot commented on GEODE-8302: --------------------------------------- albertogpz commented on pull request #5313: URL: https://github.com/apache/geode/pull/5313#issuecomment-655711375 > Hi Alberto, I would suggest splitting up the commit for GEODE-8320 fix separate from GEODE-8302. > You can still work on multiple commits for GEODE-8320 > > * This helps to maintain clear records in the release notes for releases. > > * In case we have to revert the fix for GEODE-8320 we don't have to also revert the fix for GEODE-8302 and vice versa, as these two fixes are clubbed together Hi Naba. What you are proposing makes a lot of sense. Nevertheless, in this case, I do not know if it is worth it as the solution for both tickets is shared, i.e., the solution for GEODE-8320 is a subset of the solution for GEODE-8302. If I split the solution into two PRs I would have to repeat the solution on both PRs, have it reviewed twice, do changes if needed on both... Do you still think I should do it like that or could we just have the PR for GEODE-8302 solve both GEODE-8302 and GEODE-8320? ---------------------------------------------------------------- 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)