Merge pull request #8342 from gyuho/ep-exit

ctlv3: exit non-zero on unhealty ep command
release-3.3
Gyu-Ho Lee 2017-07-31 15:45:30 -07:00 committed by GitHub
commit 073fa562d8
1 changed files with 15 additions and 3 deletions

View File

@ -81,7 +81,7 @@ func epHealthCommandFunc(cmd *cobra.Command, args []string) {
}
var wg sync.WaitGroup
errc := make(chan error, len(cfgs))
for _, cfg := range cfgs {
wg.Add(1)
go func(cfg *v3.Config) {
@ -89,7 +89,7 @@ func epHealthCommandFunc(cmd *cobra.Command, args []string) {
ep := cfg.Endpoints[0]
cli, err := v3.New(*cfg)
if err != nil {
fmt.Printf("%s is unhealthy: failed to connect: %v\n", ep, err)
errc <- fmt.Errorf("%s is unhealthy: failed to connect: %v", ep, err)
return
}
st := time.Now()
@ -102,12 +102,24 @@ func epHealthCommandFunc(cmd *cobra.Command, args []string) {
if err == nil || err == rpctypes.ErrPermissionDenied {
fmt.Printf("%s is healthy: successfully committed proposal: took = %v\n", ep, time.Since(st))
} else {
fmt.Printf("%s is unhealthy: failed to commit proposal: %v\n", ep, err)
errc <- fmt.Errorf("%s is unhealthy: failed to commit proposal: %v", ep, err)
}
}(cfg)
}
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"))
}
}
type epStatus struct {