Skip to content

Commit dc05ae7

Browse files
committed
tests/integration: set skip_wait_for_gossip_to_settle=0
to speed up the boot sequence of scylla nodes we are using `skip_wait_for_gossip_to_settle=0` same as we are using for quite a while in dtest on almost all tests also introduced `wait_other_notice=True` for placeing where starting the cluster, cause without it we can get into situatuion we start a test, and cluster isn't fully ready and up. this change shaves 1h of integration tests run, and it's now finishes in 28min.
1 parent 8c562f4 commit dc05ae7

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed

tests/integration/__init__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ def is_current_cluster(cluster_name, node_counts, workloads):
499499

500500

501501
def start_cluster_wait_for_up(cluster):
502-
cluster.start(wait_for_binary_proto=True)
502+
cluster.start(wait_for_binary_proto=True, wait_other_notice=True)
503503
# Added to wait for slow nodes to start up
504504
log.debug("Cluster started waiting for binary ports")
505505
for node in CCM_CLUSTER.nodes.values():
@@ -623,6 +623,7 @@ def use_cluster(cluster_name, nodes, ipformat=None, start=True, workloads=None,
623623
else:
624624
CCM_CLUSTER.set_configuration_options({'experimental_features': ['lwt', 'udf'], 'start_native_transport': True})
625625

626+
CCM_CLUSTER.set_configuration_options({'skip_wait_for_gossip_to_settle': 0})
626627
# Permit IS NOT NULL restriction on non-primary key columns of a materialized view
627628
# This allows `test_metadata_with_quoted_identifiers` to run
628629
CCM_CLUSTER.set_configuration_options({'strict_is_not_null_in_views': False})
@@ -659,7 +660,7 @@ def use_cluster(cluster_name, nodes, ipformat=None, start=True, workloads=None,
659660
node.set_workloads(workloads)
660661
if start:
661662
log.debug("Starting CCM cluster: {0}".format(cluster_name))
662-
CCM_CLUSTER.start(jvm_args=jvm_args, wait_for_binary_proto=True)
663+
CCM_CLUSTER.start(jvm_args=jvm_args, wait_for_binary_proto=True, wait_other_notice=True)
663664
# Added to wait for slow nodes to start up
664665
log.debug("Cluster started waiting for binary ports")
665666
for node in CCM_CLUSTER.nodes.values():

tests/integration/long/test_policies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class RetryPolicyTests(unittest.TestCase):
2929
@classmethod
3030
def tearDownClass(cls):
3131
cluster = get_cluster()
32-
cluster.start(wait_for_binary_proto=True) # make sure other nodes are restarted
32+
cluster.start(wait_for_binary_proto=True, wait_other_notice=True) # make sure other nodes are restarted
3333

3434
def test_should_rethrow_on_unvailable_with_default_policy_if_cas(self):
3535
"""

tests/integration/standard/test_authentication_misconfiguration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def setUpClass(cls):
3131
'authenticator': 'PasswordAuthenticator',
3232
'authorizer': 'CassandraAuthorizer',
3333
})
34-
ccm_cluster.start(wait_for_binary_proto=True)
34+
ccm_cluster.start(wait_for_binary_proto=True, wait_other_notice=True)
3535

3636
cls.ccm_cluster = ccm_cluster
3737

tests/integration/standard/test_custom_cluster.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,7 @@ def setup_module():
2626
config_options = {'native_transport_port': 9046}
2727
ccm_cluster.set_configuration_options(config_options)
2828
# can't use wait_for_binary_proto cause ccm tries on port 9042
29-
ccm_cluster.start(wait_for_binary_proto=False)
30-
# wait until all nodes are up
31-
wait_until_not_raised(lambda: TestCluster(contact_points=['127.0.0.1'], port=9046).connect().shutdown(), 1, 20)
32-
wait_until_not_raised(lambda: TestCluster(contact_points=['127.0.0.2'], port=9046).connect().shutdown(), 1, 20)
33-
wait_until_not_raised(lambda: TestCluster(contact_points=['127.0.0.3'], port=9046).connect().shutdown(), 1, 120)
29+
ccm_cluster.start(wait_for_binary_proto=True, wait_other_notice=True)
3430

3531

3632
def teardown_module():

tests/integration/standard/test_scylla_cloud.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def start_cluster_with_proxy(self):
4141

4242
ccm_cluster._update_config()
4343

44-
ccm_cluster.start(wait_for_binary_proto=True)
44+
ccm_cluster.start(wait_for_binary_proto=True, wait_other_notice=True)
4545

4646
nodes_info = get_cluster_info(ccm_cluster, port=ssl_port)
4747
refresh_certs(ccm_cluster, nodes_info)

0 commit comments

Comments
 (0)