thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-28 10:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24691 from nikitamikhaylov/debug_host_ip_change

Browse Source 
Fix flaky integration tests
This commit is contained in:
Nikita Mikhaylov 2021-06-01 15:55:51 +03:00 committed by GitHub
commit 5dda97bef1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/cassandra vendored

@ -1 +1 @@
Subproject commit c097fb5c7e63cc430016d9a8b240d8e63fbefa52
Subproject commit eb9b68dadbb4417a2c132ad4a1c2fa76e65e6fc1

9
tests/integration/helpers/cluster.py
View File

@ -126,7 +126,7 @@ class ClickHouseCluster:
"""
def __init__(self, base_path, name=None, base_config_dir=None, server_bin_path=None, client_bin_path=None,
odbc_bridge_bin_path=None, library_bridge_bin_path=None, zookeeper_config_path=None,
odbc_bridge_bin_path=None, library_bridge_bin_path=None, zookeeper_config_path=None,
custom_dockerd_host=None):
for param in list(os.environ.keys()):
print("ENV %40s %s" % (param, os.environ[param]))
@ -455,7 +455,10 @@ class ClickHouseCluster:
run_and_check(self.base_cmd + ["up", "--force-recreate", "--no-deps", "-d", node.name])
node.ip_address = self.get_instance_ip(node.name)
node.client = Client(node.ip_address, command=self.client_bin_path)
node.wait_for_start(start_timeout=20.0, connection_timeout=600.0) # seconds
print("Restart node with ip change")
# In builds with sanitizer the server can take a long time to start
node.wait_for_start(start_timeout=60.0, connection_timeout=600.0) # seconds
print("Restarted")
return node
def get_instance_ip(self, instance_name):
@ -1524,7 +1527,7 @@ class ClickHouseInstance:
if self.stay_alive:
entrypoint_cmd = CLICKHOUSE_STAY_ALIVE_COMMAND.replace("{main_config_file}", self.main_config_name)
print("Entrypoint cmd: {}".format(entrypoint_cmd))
networks = app_net = ipv4_address = ipv6_address = net_aliases = net_alias1 = ""

2
tests/integration/test_send_crash_reports/test.py
View File

@ -24,7 +24,7 @@ def started_node():
def test_send_segfault(started_node):
if started_node.is_built_with_thread_sanitizer():
if started_node.is_built_with_thread_sanitizer() or started_node.is_built_with_memory_sanitizer():
pytest.skip("doesn't fit in timeouts for stacktrace generation")
started_node.copy_file_to_container(os.path.join(SCRIPT_DIR, "fake_sentry_server.py"), "/fake_sentry_server.py")