etcdctl: fix exit status of endpoint command #8316
Closed
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
|
@heyitsanthony take a look, please. |
heyitsanthony
suggested changes
Jul 27, 2017
| close(errc) | ||
|
|
||
| // exit with non-zero exit status in case of errors. | ||
| os.Exit(<-errCountc) |
There was a problem hiding this comment.
the exit code shouldn't change based on the number of errors; ExitWithError(ExitError, fmt.Errorf("unhealthy cluster")) would be more consistent with the rest of etcdctl
| defer close(errCountc) | ||
|
|
||
| // drain errors channel until it is closed. | ||
| go func() { |
There was a problem hiding this comment.
this extra concurrency isn't necessary since errc is already buffered-- keep it simple by doing the error pass after the other goroutine complete:
wg.Wait()
close(errc)
errs := false
for err := range errc {
if err != nil {
errs = true
fmt.Fprintln(os.Stderr, err)
}
}
if errs {
ExitWithError(ExitError, fmt.Errorf("unhealthy cluster"))
}|
|
||
| for _, cfg := range cfgs { | ||
| wg.Add(1) | ||
| go func(cfg *v3.Config) { | ||
| go func(cfg *v3.Config, errc chan<- error) { |
There was a problem hiding this comment.
this line can stay the same-- errc is already captured by the closure
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #8295. Based on channels solution from discussion on #8307.