This repository has been archived by the owner on Dec 4, 2024. It is now read-only.
Emulate behaviour of haproxy-systemd-wrapper.
#390
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
brndnmtthws
force-pushed
the
use-pipe-for-safe-reloads
branch
15 times, most recently
from
aead97d to
96023d4
Compare
brndnmtthws
force-pushed
the
use-pipe-for-safe-reloads
branch
2 times, most recently
from
ab5ac4a to
16c9ab6
Compare
|
You may also care about signals propagation, see http://git.haproxy.org/?p=haproxy-1.7.git;a=commit;h=4351ea61fbddf88c960179d60b0e0f1b090f0b70 |
|
Correct me if I'm wrong, but I think that only matters if you're using signals to reload HAProxy, which we aren't. |
vixns
reviewed
Dec 24, 2016
| @@ -33,7 +33,7 @@ reload() { | |||
|
|
|||
| # Trigger reload | |||
| LATEST_HAPROXY_PID=$(cat $PIDFILE) | |||
| haproxy -p $PIDFILE -f /marathon-lb/haproxy.cfg -D -sf $LATEST_HAPROXY_PID 200>&- | |||
| /marathon-lb/haproxy_wrapper.py `which haproxy` -p $PIDFILE -f /marathon-lb/haproxy.cfg -D -sf $LATEST_HAPROXY_PID 200>&- | |||
There was a problem hiding this comment.
do not fork this, must block the execution until reload is over.
test the return code, should log to stderr in case of error.
| @@ -33,7 +33,7 @@ reload() { | |||
|
|
|||
| # Trigger reload | |||
| LATEST_HAPROXY_PID=$(cat $PIDFILE) | |||
| haproxy -p $PIDFILE -f /marathon-lb/haproxy.cfg -D -sf $LATEST_HAPROXY_PID 200>&- | |||
| /marathon-lb/haproxy_wrapper.py `which haproxy` -p $PIDFILE -f /marathon-lb/haproxy.cfg -D -sf $LATEST_HAPROXY_PID 200>&- | |||
| if [ -n "${HAPROXY_RELOAD_SIGTERM_DELAY-}" ]; then | |||
| sleep $HAPROXY_RELOAD_SIGTERM_DELAY && kill $LATEST_HAPROXY_PID 200>&- 2>/dev/null & | |||
| fi | |||
There was a problem hiding this comment.
HAPROXY_RELOAD_SIGTERM_DELAY is no longer needed
| if len(ret) == 0: | ||
| close_and_swallow(pipefd[0]) | ||
| close_and_swallow(pipefd[1]) | ||
| return False |
There was a problem hiding this comment.
is empty ret an error case ? if not should return True here
| # Close the write side | ||
| os.close(pipefd[1]) | ||
| while wait_on_haproxy_pipe(pipefd): | ||
| time.sleep(0.01) |
There was a problem hiding this comment.
add an explicit exit code / error message
brndnmtthws
force-pushed
the
use-pipe-for-safe-reloads
branch
9 times, most recently
from
3eb9900 to
42a70ae
Compare
brndnmtthws
force-pushed
the
use-pipe-for-safe-reloads
branch
10 times, most recently
from
0173b24 to
0cd1916
Compare
This also drops the `HAPROXY_RELOAD_SIGTERM_DELAY` param. For reference, see: http://git.haproxy.org/?p=haproxy.git;a=blob;f=src/haproxy-systemd-wrapper.c;h=f6a9c852b277b5f193d6a952119a149b4cfe3e8b;hb=HEAD
|
This seems to be working now. I'm going to go ahead and merge it soon. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For reference, see:
http://git.haproxy.org/?p=haproxy.git;a=blob;f=src/haproxy-systemd-wrapper.c;h=f6a9c852b277b5f193d6a952119a149b4cfe3e8b;hb=HEAD