github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 11:13:48 +00:00
Code Issues Projects Releases Wiki Activity

Increase timeout waiting for service shard to appear

Browse Source
This commit is contained in:
shashidharatd 2017-03-08 09:38:24 +05:30
parent bf7f42d362
commit b23ceff61a
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e_federation/service.go
View File

@ -37,13 +37,8 @@ import (
) )
const ( const (
FederatedServiceTimeout = 60 * time.Second
FederatedServiceName = "federated-service" FederatedServiceName = "federated-service"
FederatedServicePodName = "federated-service-test-pod" FederatedServicePodName = "federated-service-test-pod"
KubeDNSConfigMapName = "kube-dns"
KubeDNSConfigMapNamespace = "kube-system"
) )
var FederatedServiceLabels = map[string]string{ var FederatedServiceLabels = map[string]string{

16
test/e2e_federation/util.go
View File

@ -55,7 +55,9 @@ var (
) )
const ( const (
federatedNamespaceTimeout = 5 * time.Minute federatedNamespaceTimeout = 5 * time.Minute
federatedServiceTimeout = 5 * time.Minute
federatedClustersWaitTimeout = 1 * time.Minute
) )
var FederationSuite common.Suite var FederationSuite common.Suite
@ -110,7 +112,7 @@ func clusterIsReadyOrFail(f *fedframework.Framework, context *fedframework.E2ECo
// return ClusterList until the listed cluster items equals clusterCount // return ClusterList until the listed cluster items equals clusterCount
func waitForAllRegisteredClusters(f *fedframework.Framework, clusterCount int) *federationapi.ClusterList { func waitForAllRegisteredClusters(f *fedframework.Framework, clusterCount int) *federationapi.ClusterList {
var clusterList *federationapi.ClusterList var clusterList *federationapi.ClusterList
if err := wait.PollImmediate(framework.Poll, FederatedServiceTimeout, func() (bool, error) { if err := wait.PollImmediate(framework.Poll, federatedClustersWaitTimeout, func() (bool, error) {
var err error var err error
clusterList, err = f.FederationClientset.Federation().Clusters().List(metav1.ListOptions{}) clusterList, err = f.FederationClientset.Federation().Clusters().List(metav1.ListOptions{})
if err != nil { if err != nil {
@ -260,7 +262,7 @@ func waitForServiceOrFail(clientset *kubeclientset.Clientset, namespace string,
func waitForServiceShardsOrFail(namespace string, service *v1.Service, clusters map[string]*cluster) { func waitForServiceShardsOrFail(namespace string, service *v1.Service, clusters map[string]*cluster) {
framework.Logf("Waiting for service %q in %d clusters", service.Name, len(clusters)) framework.Logf("Waiting for service %q in %d clusters", service.Name, len(clusters))
for _, c := range clusters { for _, c := range clusters {
waitForServiceOrFail(c.Clientset, namespace, service, true, FederatedServiceTimeout) waitForServiceOrFail(c.Clientset, namespace, service, true, federatedServiceTimeout)
} }
} }
@ -326,7 +328,7 @@ func cleanupServiceShardsAndProviderResources(namespace string, service *v1.Serv
for name, c := range clusters { for name, c := range clusters {
var cSvc *v1.Service var cSvc *v1.Service
err := wait.PollImmediate(framework.Poll, FederatedServiceTimeout, func() (bool, error) { err := wait.PollImmediate(framework.Poll, federatedServiceTimeout, func() (bool, error) {
var err error var err error
cSvc, err = c.Clientset.Services(namespace).Get(service.Name, metav1.GetOptions{}) cSvc, err = c.Clientset.Services(namespace).Get(service.Name, metav1.GetOptions{})
if err != nil && !errors.IsNotFound(err) { if err != nil && !errors.IsNotFound(err) {
@ -343,15 +345,15 @@ func cleanupServiceShardsAndProviderResources(namespace string, service *v1.Serv
}) })
if err != nil || cSvc == nil { if err != nil || cSvc == nil {
By(fmt.Sprintf("Failed to find service %q in namespace %q, in cluster %q in %s", service.Name, namespace, name, FederatedServiceTimeout)) By(fmt.Sprintf("Failed to find service %q in namespace %q, in cluster %q in %s", service.Name, namespace, name, federatedServiceTimeout))
continue continue
} }
err = cleanupServiceShard(c.Clientset, name, namespace, cSvc, FederatedServiceTimeout) err = cleanupServiceShard(c.Clientset, name, namespace, cSvc, federatedServiceTimeout)
if err != nil { if err != nil {
framework.Logf("Failed to delete service %q in namespace %q, in cluster %q: %v", service.Name, namespace, name, err) framework.Logf("Failed to delete service %q in namespace %q, in cluster %q: %v", service.Name, namespace, name, err)
} }
err = cleanupServiceShardLoadBalancer(name, cSvc, FederatedServiceTimeout) err = cleanupServiceShardLoadBalancer(name, cSvc, federatedServiceTimeout)
if err != nil { if err != nil {
framework.Logf("Failed to delete cloud provider resources for service %q in namespace %q, in cluster %q", service.Name, namespace, name) framework.Logf("Failed to delete cloud provider resources for service %q in namespace %q, in cluster %q", service.Name, namespace, name)
} }