[cassandra-dtest] branch master updated: Wait on notifications to propagate

[br...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 30806d4  Wait on notifications to propagate
30806d4 is described below

commit 30806d425e2271b982bf8facb174341b6b4193ed
Author: Bereng <be...@gmail.com>
AuthorDate: Wed Jul 8 14:20:44 2020 +0200

    Wait on notifications to propagate
    
    Patch by Berenguer Blasi, reviewed by brandonwilliams for
    CASSANDRA-15912
---
 pushed_notifications_test.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pushed_notifications_test.py b/pushed_notifications_test.py
index fb703e9..f9544a4 100644
--- a/pushed_notifications_test.py
+++ b/pushed_notifications_test.py
@@ -229,6 +229,12 @@ class TestPushedNotifications(Tester):
         waiter = NotificationWaiter(self, node1, ["STATUS_CHANGE", "TOPOLOGY_CHANGE"])
 
         # restart node 2
+        version = self.cluster.cassandra_version()
+        if version >= '4.0':
+            # >=4.0 we wait for the NEW_NODE and UP notifications to reach us
+            waiter.wait_for_notifications(timeout=30.0, num_notifications=2)
+            waiter.clear_notifications()
+
         logger.debug("Restarting second node...")
         node2.stop(wait_other_notice=True)
         node2.start(wait_other_notice=True)
@@ -236,7 +242,6 @@ class TestPushedNotifications(Tester):
         # check that node1 did not send UP or DOWN notification for node2
         logger.debug("Waiting for notifications from {}".format(waiter.address,))
         notifications = waiter.wait_for_notifications(timeout=30.0, num_notifications=2)
-        version = self.cluster.cassandra_version()
 
         if version >= '4.0':
             # CASSANDRA-15677 Post 4.0 we'll get the notifications. Check that they are for the right node.


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