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

Add etcd server check at startup to kube2sky (with retry loop).

Browse Source
This commit is contained in:
Fabio Yeon 2015-03-04 15:41:17 -08:00
parent aea98765f4
commit 01f7d459d3
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cluster/addons/dns/kube2sky/kube2sky.go
View File

@ -30,6 +30,7 @@ import (
kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api" kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
kclient "github.com/GoogleCloudPlatform/kubernetes/pkg/client" kclient "github.com/GoogleCloudPlatform/kubernetes/pkg/client"
klabels "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" klabels "github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
tools "github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
kwatch "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" kwatch "github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
etcd "github.com/coreos/go-etcd/etcd" etcd "github.com/coreos/go-etcd/etcd"
skymsg "github.com/skynetservices/skydns/msg" skymsg "github.com/skynetservices/skydns/msg"
@ -37,8 +38,9 @@ import (
var ( var (
domain = flag.String("domain", "kubernetes.local", "domain under which to create names") domain = flag.String("domain", "kubernetes.local", "domain under which to create names")
verbose = flag.Bool("verbose", false, "log extra information")
etcd_mutation_timeout = flag.Duration("etcd_mutation_timeout", 10*time.Second, "crash after retrying etcd mutation for a specified duration") etcd_mutation_timeout = flag.Duration("etcd_mutation_timeout", 10*time.Second, "crash after retrying etcd mutation for a specified duration")
etcd_server = flag.String("etcd-server", "http://127.0.0.1:4001", "URL to etcd server")
verbose = flag.Bool("verbose", false, "log extra information")
) )
func removeDNS(record string, etcdClient *etcd.Client) error { func removeDNS(record string, etcdClient *etcd.Client) error {
@ -87,8 +89,23 @@ func mutateEtcdOrDie(mutator func() error) {
} }
func newEtcdClient() (client *etcd.Client) { func newEtcdClient() (client *etcd.Client) {
// TODO: take a flag for etcd server(s). maxConnectRetries := 12
client = etcd.NewClient([]string{"http://127.0.0.1:4001"}) for maxConnectRetries > 0 {
if _, _, err := tools.GetEtcdVersion(*etcd_server); err != nil {
log.Fatalf("Failed to connect to etcd server: %v, error: %v", *etcd_server, err)
if maxConnectRetries > 0 {
log.Println("Retrying request after 5 second sleep.")
time.Sleep(5 * time.Second)
maxConnectRetries--
} else {
return nil
}
} else {
log.Printf("Etcd server found: %v", *etcd_server)
break
}
}
client = etcd.NewClient([]string{*etcd_server})
if client == nil { if client == nil {
return nil return nil
} }