[cassandra-dtest] branch trunk updated: Reduce data amount and allow one read for reset interval

[br...@apache.org]

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

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


The following commit(s) were added to refs/heads/trunk by this push:
     new f5e32c7  Reduce data amount and allow one read for reset interval
f5e32c7 is described below

commit f5e32c7743154b87bc6398a25684c323ef129f2f
Author: Brandon Williams <br...@apache.org>
AuthorDate: Fri Mar 12 13:41:52 2021 -0600

    Reduce data amount and allow one read for reset interval
    
    Patch by brandonwilliams; reviewed by Berenguer Blasi for
    CASSANDRA-16472
---
 snitch_test.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/snitch_test.py b/snitch_test.py
index a931303..ec66ed0 100644
--- a/snitch_test.py
+++ b/snitch_test.py
@@ -190,7 +190,7 @@ class TestDynamicEndpointSnitch(Tester):
         insert_stmt.consistency_level = ConsistencyLevel.ALL
         with JolokiaAgent(coordinator_node) as jmx:
             with JolokiaAgent(degraded_node) as bad_jmx:
-                for x in range(0, 300):
+                for x in range(0, 150):
                     session.execute(insert_stmt, [x])
 
                 cleared = False
@@ -202,7 +202,7 @@ class TestDynamicEndpointSnitch(Tester):
 
                 snitchable_count = 0
 
-                for x in range(0, 300):
+                for x in range(0, 150):
                     degraded_reads_before = bad_jmx.read_attribute(read_stage, 'Value')
                     scores_before = jmx.read_attribute(des, 'Scores')
                     assert no_cross_dc(scores_before, [node4, node5, node6]), "Cross DC scores were present: " + str(scores_before)
@@ -215,13 +215,15 @@ class TestDynamicEndpointSnitch(Tester):
                                   [coordinator_node, healthy_node, degraded_node]):
                         snitchable_count = snitchable_count + 1
                         # If the DES correctly routed the read around the degraded node,
-                        # it shouldn't have another completed read request in metrics
-                        assert (degraded_reads_before ==
-                                     bad_jmx.read_attribute(read_stage, 'Value'))
+                        # it shouldn't have another completed read request in metrics,
+                        # unless there was one right after a reset.
+                        degraded_reads = bad_jmx.read_attribute(read_stage, 'Value')
+                        difference = abs(degraded_reads_before - degraded_reads)
+                        assert difference <= 1, "too many reads hit the degraded node: %s" % difference
                     else:
                         # sleep to give dynamic snitch time to recalculate scores
                         time.sleep(.1)
 
                 # check that most reads were snitchable, with some
                 # room allowed in case score recalculation is slow
-                assert snitchable_count >= 250
+                assert snitchable_count >= 125


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