Fix exit codes in health check script #51
Merged
Conversation
This file contains hidden or 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
|
Ah! This explains why the CI jobs on another repo that uses this tang image started failing. |
SaswatPadhi
requested changes
Aug 11, 2022
check-servers.sh
Outdated
|
|
||
| [ "$ENABLE_IPv4" = "1" ] && wget -4qSO /dev/null http://127.0.0.1:8080/adv | ||
| [ "$ENABLE_IPv6" = "1" ] && wget -6qSO /dev/null http://[::1]:8080/adv | ||
| [ "$ENABLE_IPv4" = "1" ] && $(wget -4qSO /dev/null http://127.0.0.1:8080/adv || exit 1) |
There was a problem hiding this comment.
I think it might be cleaner to use an if-then-else block instead of using subshell expansions and exits.
Suggested change
| [ "$ENABLE_IPv4" = "1" ] && $(wget -4qSO /dev/null http://127.0.0.1:8080/adv || exit 1) | |
| if [ "$ENABLE_IPv4" = "1" ]; then | |
| wget -4qSO /dev/null http://127.0.0.1:8080/adv | |
| fi |
(same comment on the ENABLE_IPv6 case below.
|
Done. I agree that this looks much cleaner now without the explicit I added another commit to use |
SaswatPadhi
approved these changes
Aug 11, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Before this PR, if
ENABLE_IPv6is set to0(which is the default), then the health check script always exits with code1(reporting an unhealthy state) regardless of whether the IPv4 check succeeds or not.This happens because the check
[ "$ENABLE_IPv6" = "1" ]is the last command that runs in the script (whenENABLE_IPv6=0), and since it evaluates tofalse(i.e., returns exit code1), the entire script exits with exit code1, indicating a failure.In this PR, we explicitly use
ifstatements (instead of command chaining using&&) to prevent this issue incheck-servers.sh, and we useifstatements instart-servers.shto maintain consistency among all shell scripts in the repository.