mirror of
https://github.com/dragonflydb/dragonfly.git
synced 2025-03-29 11:52:22 +00:00
fix: stop using openssl for container healthchecks (#4181)
Dragonfly responds to ascii based requests to tls port with: `-ERR Bad TLS header, double check if you enabled TLS for your client.` Therefore, it is possible to test now both tls and non-tls ports with a plain-text PING. Fixes #4171 Also, blacklist the bloom-filter test that Dragonfly does not support yet. Signed-off-by: Roman Gershman <roman@dragonflydb.io>
This commit is contained in:
@ -16,6 +16,7 @@ def test_create_bf(r: redis.Redis):
|
||||
assert r.bf().create("bloom_ns", 0.01, 1000, noScale=True)
|
||||
|
||||
|
||||
@pytest.mark.unsupported_server_types("dragonfly")
|
||||
def test_bf_reserve(r: redis.Redis):
|
||||
assert r.bf().reserve("bloom", 0.01, 1000)
|
||||
assert r.bf().reserve("bloom_ns", 0.01, 1000, noScale=True)
|
||||
|
@ -20,13 +20,7 @@ if [ -z "$HEALTHCHECK_PORT" ]; then
|
||||
PORT=$(echo $DF_NET | grep -oE ':[0-9]+' | cut -c2- | tail -n 1)
|
||||
fi
|
||||
|
||||
# If we're running with TLS enabled, utilise OpenSSL for the check
|
||||
if [ -f "/etc/dragonfly/tls/ca.crt" ]
|
||||
then
|
||||
_healthcheck="openssl s_client -connect ${HOST}:${PORT} -CAfile /etc/dragonfly/tls/ca.crt -quiet -no_ign_eof"
|
||||
else
|
||||
_healthcheck="nc -q1 $HOST $PORT"
|
||||
fi
|
||||
_healthcheck="nc -q1 $HOST $PORT"
|
||||
|
||||
echo PING | ${_healthcheck}
|
||||
|
||||
|
Reference in New Issue
Block a user