github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #72896 from lorenz/fix-apiserver-healthcheck

Browse Source 
Fix etcd healthcheck for consensus failures
This commit is contained in:
Kubernetes Prow Robot 2019-01-25 15:27:45 -08:00 committed by GitHub
commit b04d7ca976
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go
View File

@ -19,6 +19,7 @@ package factory
import ( import (
"context" "context"
"fmt" "fmt"
"path"
"sync" "sync"
"sync/atomic" "sync/atomic"
"time" "time"
@ -72,10 +73,12 @@ func newETCD3HealthCheck(c storagebackend.Config) (func() error, error) {
client := clientValue.Load().(*clientv3.Client) client := clientValue.Load().(*clientv3.Client)
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
defer cancel() defer cancel()
if _, err := client.Cluster.MemberList(ctx); err != nil { // See https://github.com/etcd-io/etcd/blob/master/etcdctl/ctlv3/command/ep_command.go#L118
return fmt.Errorf("error listing etcd members: %v", err) _, err := client.Get(ctx, path.Join(c.Prefix, "health"))
if err == nil {
return nil
} }
return nil return fmt.Errorf("error getting data from etcd: %v", err)
}, nil }, nil
} }