Skip to content

Commit 13dcbf7

Browse files
committed
delay and decrease probe frequency of is_clickhouse_running to reduce logspam
1 parent b8bfc11 commit 13dcbf7

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

ooniapi/services/oonimeasurements/tests/conftest.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ def maybe_download_fixtures():
4040

4141

4242
def is_clickhouse_running(url):
43+
# using ClickhouseClient as probe spams WARN messages with logger in clickhouse_driver
44+
time.sleep(2)
4345
try:
4446
with ClickhouseClient.from_url(url) as client:
4547
client.execute("SELECT 1")
@@ -53,7 +55,7 @@ def clickhouse_server(maybe_download_fixtures, docker_ip, docker_services):
5355
port = docker_services.port_for("clickhouse", 9000)
5456
url = "clickhouse://test:test@{}:{}".format(docker_ip, port)
5557
docker_services.wait_until_responsive(
56-
timeout=30.0, pause=0.1, check=lambda: is_clickhouse_running(url)
58+
timeout=30.0, pause=1.0, check=lambda: is_clickhouse_running(url)
5759
)
5860
yield url
5961

ooniapi/services/ooniprobe/tests/conftest.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import pytest
55
import shutil
66
import os
7+
import time
78
from urllib.request import urlopen
89

910
from fastapi.testclient import TestClient
@@ -125,6 +126,8 @@ def jwt_encryption_key():
125126

126127

127128
def is_clickhouse_running(url):
129+
# using ClickhouseClient as probe spams WARN messages with logger in clickhouse_driver
130+
time.sleep(2)
128131
try:
129132
with ClickhouseClient.from_url(url) as client:
130133
client.execute("SELECT 1")
@@ -139,7 +142,7 @@ def clickhouse_server(docker_ip, docker_services):
139142
# See password in docker compose
140143
url = "clickhouse://test:test@{}:{}".format(docker_ip, port)
141144
docker_services.wait_until_responsive(
142-
timeout=30.0, pause=0.1, check=lambda: is_clickhouse_running(url)
145+
timeout=30.0, pause=1.0, check=lambda: is_clickhouse_running(url)
143146
)
144147
yield url
145148

0 commit comments

Comments
 (0)