mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-30 06:54:01 +00:00
Merge pull request #2279 from brendandburns/integration
Added some etcd retries to try to work around some flakes we see in Travis
This commit is contained in:
commit
1be56fa91b
@ -110,14 +110,28 @@ func startComponents(manifestURL string) (apiServerURL string) {
|
|||||||
apiServer := httptest.NewServer(&handler)
|
apiServer := httptest.NewServer(&handler)
|
||||||
|
|
||||||
etcdClient := etcd.NewClient(servers)
|
etcdClient := etcd.NewClient(servers)
|
||||||
keys, err := etcdClient.Get("/", false, false)
|
sleep := 4 * time.Second
|
||||||
if err != nil {
|
ok := false
|
||||||
glog.Fatalf("Unable to list root etcd keys: %v", err)
|
for i := 0; i < 3; i++ {
|
||||||
}
|
keys, err := etcdClient.Get("/", false, false)
|
||||||
for _, node := range keys.Node.Nodes {
|
if err != nil {
|
||||||
if _, err := etcdClient.Delete(node.Key, true); err != nil {
|
glog.Warningf("Unable to list root etcd keys: %v", err)
|
||||||
glog.Fatalf("Unable delete key: %v", err)
|
if i < 2 {
|
||||||
|
time.Sleep(sleep)
|
||||||
|
sleep = sleep * sleep
|
||||||
|
}
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
|
for _, node := range keys.Node.Nodes {
|
||||||
|
if _, err := etcdClient.Delete(node.Key, true); err != nil {
|
||||||
|
glog.Fatalf("Unable delete key: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ok = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if !ok {
|
||||||
|
glog.Fatalf("Failed to connect to etcd")
|
||||||
}
|
}
|
||||||
|
|
||||||
cl := client.NewOrDie(&client.Config{Host: apiServer.URL, Version: testapi.Version()})
|
cl := client.NewOrDie(&client.Config{Host: apiServer.URL, Version: testapi.Version()})
|
||||||
|
Loading…
Reference in New Issue
Block a user