[cassandra] branch trunk updated: Fix flaky test LocalReadSizeWarningTest#failThresholdSinglePartition

[ycai]

This is an automated email from the ASF dual-hosted git repository.

ycai pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 2fe1c30483 Fix flaky test 
LocalReadSizeWarningTest#failThresholdSinglePartition
2fe1c30483 is described below

commit 2fe1c304835ef39093b70cbb89107383be3c3ee9
Author: Bernardo Botella Corbi <b_botellaco...@apple.com>
AuthorDate: Tue Apr 12 11:06:41 2022 -0700

    Fix flaky test LocalReadSizeWarningTest#failThresholdSinglePartition
    
    patch by Bernardo Botella Corbi; reviewed by Andres de la Peña, Yifan Cai 
for CASSANDRA-17217
---
 .../trackwarnings/AbstractClientSizeWarning.java   | 35 ++++++++++++++++++----
 .../trackwarnings/RowIndexSizeWarningTest.java     |  8 ++++-
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git 
a/test/distributed/org/apache/cassandra/distributed/test/trackwarnings/AbstractClientSizeWarning.java
 
b/test/distributed/org/apache/cassandra/distributed/test/trackwarnings/AbstractClientSizeWarning.java
index 42670c7aa1..34b2322a89 100644
--- 
a/test/distributed/org/apache/cassandra/distributed/test/trackwarnings/AbstractClientSizeWarning.java
+++ 
b/test/distributed/org/apache/cassandra/distributed/test/trackwarnings/AbstractClientSizeWarning.java
@@ -211,15 +211,27 @@ public abstract class AbstractClientSizeWarning extends 
TestBaseImpl
     }
 
     @Test
-    public void failThresholdSinglePartition() throws UnknownHostException
+    public void failThresholdSinglePartitionTrackingEnabled() throws 
UnknownHostException
     {
-        failThreshold(CQL_PK_READ);
+        failThresholdEnabled(CQL_PK_READ);
     }
 
     @Test
-    public void failThresholdScan() throws UnknownHostException
+    public void failThresholdSinglePartitionTrackingDisabled() throws 
UnknownHostException
     {
-        failThreshold(CQL_TABLE_SCAN);
+        failThresholdDisabled(CQL_PK_READ);
+    }
+
+    @Test
+    public void failThresholdScanTrackingEnabled() throws UnknownHostException
+    {
+        failThresholdEnabled(CQL_TABLE_SCAN);
+    }
+
+    @Test
+    public void failThresholdScanTrackingDisabled() throws UnknownHostException
+    {
+        failThresholdDisabled(CQL_TABLE_SCAN);
     }
 
     protected int failThresholdRowCount()
@@ -227,7 +239,7 @@ public abstract class AbstractClientSizeWarning extends 
TestBaseImpl
         return 5;
     }
 
-    public void failThreshold(String cql) throws UnknownHostException
+    public void failThresholdEnabled(String cql) throws UnknownHostException
     {
         ICoordinator node = CLUSTER.coordinator(1);
         for (int i = 0; i < failThresholdRowCount(); i++)
@@ -283,15 +295,26 @@ public abstract class AbstractClientSizeWarning extends 
TestBaseImpl
         }
         assertHistogramUpdated();
         assertWarnAborts(0, 2, 1);
+    }
+
+    public void failThresholdDisabled(String cql) throws UnknownHostException
+    {
+        ICoordinator node = CLUSTER.coordinator(1);
+        for (int i = 0; i < failThresholdRowCount(); i++)
+            node.execute("INSERT INTO " + KEYSPACE + ".tbl (pk, ck, v) VALUES 
(1, ?, ?)", ConsistencyLevel.ALL, i + 1, bytes(512));
+
+        if (shouldFlush())
+            CLUSTER.stream().forEach(i -> i.flush(KEYSPACE));
 
         // query should no longer fail
         enable(false);
+        checkpointHistogram();
         SimpleQueryResult result = node.executeWithResult(cql, 
ConsistencyLevel.ALL);
         assertThat(result.warnings()).isEmpty();
         assertHistogramNotUpdated();
         
assertThat(driverQueryAll(cql).getExecutionInfo().getWarnings()).isEmpty();
         assertHistogramNotUpdated();
-        assertWarnAborts(0, 2, 0);
+        assertWarnAborts(0, 0, 0);
     }
 
     protected static void enable(boolean value)
diff --git 
a/test/distributed/org/apache/cassandra/distributed/test/trackwarnings/RowIndexSizeWarningTest.java
 
b/test/distributed/org/apache/cassandra/distributed/test/trackwarnings/RowIndexSizeWarningTest.java
index 5a2957d207..43f3061329 100644
--- 
a/test/distributed/org/apache/cassandra/distributed/test/trackwarnings/RowIndexSizeWarningTest.java
+++ 
b/test/distributed/org/apache/cassandra/distributed/test/trackwarnings/RowIndexSizeWarningTest.java
@@ -84,7 +84,13 @@ public class RowIndexSizeWarningTest extends 
AbstractClientSizeWarning
     }
 
     @Override
-    public void failThresholdScan()
+    public void failThresholdScanTrackingEnabled()
+    {
+        Assume.assumeFalse("Ignore Scans", true);
+    }
+
+    @Override
+    public void failThresholdScanTrackingDisabled()
     {
         Assume.assumeFalse("Ignore Scans", true);
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org