This is an automated email from the ASF dual-hosted git repository. samt pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 95eb9976e50a27ce680459419a7775982a6a9a8e Author: Sam Tunnicliffe <[email protected]> AuthorDate: Thu Nov 2 18:45:59 2023 +0000 [CEP-21] Adjust expected bootstrap state in write survey mode --- bootstrap_test.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bootstrap_test.py b/bootstrap_test.py index c3a0d757..e09066bf 100644 --- a/bootstrap_test.py +++ b/bootstrap_test.py @@ -133,7 +133,10 @@ class BootstrapTester(Tester): node2.start(jvm_args=["-Dcassandra.write_survey=true"], wait_for_binary_proto=True) assert len(node2.grep_log('Startup complete, but write survey mode is active, not becoming an active ring member.')) - assert_bootstrap_state(self, node2, 'IN_PROGRESS') + # bootstrapping is considered complete if streaming is successful. Post CEP-21 this is distinct from + # fully joining the ring or leaving write survey mode + bootstrap_state = 'COMPLETED' if self.cluster.version() >= LooseVersion('5.1') else 'IN_PROGRESS' + assert_bootstrap_state(self, node2, bootstrap_state) node2.nodetool("join") assert len(node2.grep_log('Leaving write survey mode and joining ring at operator request')) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
