thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 00:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

make a better healthcheck

Browse Source
This commit is contained in:
Andrey Zvonov 2024-06-27 19:30:45 +00:00
parent bebed0598d
commit bf1cc136db
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/integration/compose/docker_compose_ldap.yml
View File

@ -15,7 +15,10 @@ services:
ports:
- ${LDAP_EXTERNAL_PORT:-1389}:${LDAP_INTERNAL_PORT:-1389}
healthcheck:
test: "ldapsearch -x -b dc=example,dc=org cn > /dev/null"
test: >
ldapsearch -x -H ldap://localhost:$$LDAP_PORT_NUMBER -D $$LDAP_ADMIN_DN -w $$LDAP_ADMIN_PASSWORD -b $$LDAP_ROOT
| grep -c -E "member: cn=j(ohn|ane)doe"
| grep 2 >> /dev/null
interval: 10s
retries: 10
timeout: 2s

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

@ -2640,7 +2640,9 @@ class ClickHouseCluster:
[
"bash",
"-c",
f"/opt/bitnami/openldap/bin/ldapsearch -x -H ldap://{self.ldap_host}:{self.ldap_port} -D cn=admin,dc=example,dc=org -w clickhouse -b dc=example,dc=org",
f'/opt/bitnami/openldap/bin/ldapsearch -x -H ldap://{self.ldap_host}:{self.ldap_port} -D cn=admin,dc=example,dc=org -w clickhouse -b dc=example,dc=org'
f'| grep -c -E "member: cn=j(ohn|ane)doe"'
f'| grep 2 >> /dev/null',
],
user="root",
)