Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix testHAProxyModeConnectionWorks is flaky #16087

Merged
merged 3 commits into from
Sep 29, 2024
Merged

Fix testHAProxyModeConnectionWorks is flaky #16087

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
def25bd
Fix testHAProxyModeConnectionWorks is flaky
gaobinlong Sep 26, 2024
ea53d79
Optimize health check method
gaobinlong Sep 29, 2024
df2e1fe
Merge remote-tracking branch 'upstream/main' into fix_flaky
gaobinlong Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions qa/remote-clusters/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM haproxy:2.1.2

# Install netcat
RUN apt-get update && \
apt-get install -y netcat-traditional && \
rm -rf /var/lib/apt/lists/*
11 changes: 11 additions & 0 deletions qa/remote-clusters/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,19 @@ services:
timeout: 2s
retries: 5
haproxy:
build:
context: .
dockerfile: Dockerfile
image: haproxy:2.1.2
ports:
- "9600"
volumes:
- ./haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro
depends_on:
- opensearch-2
healthcheck:
test: ["CMD", "nc", "-z", "localhost", "9600"]
reta marked this conversation as resolved.
Show resolved Hide resolved
interval: 2s
timeout: 1s
retries: 5
start_period: 15s
Loading