test again (#92)

* test again * fix
yunify · Nov 1, 2019 · 7b98a3c · 7b98a3c
1 parent 90ff69a
commit 7b98a3c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/pkg/qingcloud/loadbalancer_impl.go b/pkg/qingcloud/loadbalancer_impl.go
@@ -81,9 +81,10 @@ func (qc *QingCloud) GetLoadBalancerName(_ context.Context, _ string, service *v
 // Parameter 'clusterName' is the name of the cluster as presented to kube-controller-manager
 func (qc *QingCloud) EnsureLoadBalancer(ctx context.Context, _ string, service *v1.Service, nodes []*v1.Node) (*v1.LoadBalancerStatus, error) {
 	startTime := time.Now()
+	klog.Infof("===============EnsureLoadBalancer for %s", service.Namespace+"/"+service.Name)
 	defer func() {
 		elapsed := time.Since(startTime)
-		klog.V(1).Infof("EnsureLoadBalancer takes total %d seconds", elapsed/time.Second)
+		klog.V(1).Infof("===============EnsureLoadBalancer takes total %d seconds", elapsed/time.Second)
 	}()
 	lb, err := qc.newLoadBalance(ctx, service, nodes, false)
 	if err != nil {
@@ -93,6 +94,9 @@ func (qc *QingCloud) EnsureLoadBalancer(ctx context.Context, _ string, service *
 	if err != nil {
 		return nil, err
 	}
+	for _, ing := range lb.Status.K8sLoadBalancerStatus.Ingress {
+		klog.Infof("[Got lb IP], service %s/%s get ip %s", service.Namespace, service.Name, ing.IP)
+	}
 	return lb.Status.K8sLoadBalancerStatus, nil
 }
 
@@ -101,10 +105,11 @@ func (qc *QingCloud) EnsureLoadBalancer(ctx context.Context, _ string, service *
 // parameters as read-only and not modify them.
 // Parameter 'clusterName' is the name of the cluster as presented to kube-controller-manager
 func (qc *QingCloud) UpdateLoadBalancer(ctx context.Context, _ string, service *v1.Service, nodes []*v1.Node) error {
+	klog.Infof("===============UpdateLoadBalancer for %s", service.Namespace+"/"+service.Name)
 	startTime := time.Now()
 	defer func() {
 		elapsed := time.Since(startTime)
-		klog.V(1).Infof("UpdateLoadBalancer takes total %d seconds", elapsed/time.Second)
+		klog.V(1).Infof("===============UpdateLoadBalancer takes total %d seconds", elapsed/time.Second)
 	}()
 	lb, err := qc.newLoadBalance(ctx, service, nodes, false)
 	if err != nil {

diff --git a/test/pkg/e2e/e2e_test.go b/test/pkg/e2e/e2e_test.go
@@ -33,12 +33,12 @@ var _ = Describe("QingCloud LoadBalancer e2e-test", func() {
 			Expect(err).ShouldNot(HaveOccurred())
 			lbName := loadbalance.GetLoadBalancerName(TestCluster, service, nil)
 			Expect(e2eutil.KubectlDelete(servicePath)).ShouldNot(HaveOccurred())
-			time.Sleep(time.Second * 80)
+			time.Sleep(time.Second * 70)
 			//make sure lb is deleted
 			lbService, _ := qcService.LoadBalancer("ap2a")
 			Eventually(func() error { return e2eutil.WaitForLoadBalancerDeleted(lbService, lbName) }, time.Minute*3, time.Second*20).Should(Succeed())
 		}()
-		log.Println("Just wait 2 minutes before tests because following procedure is so so so slow ")
+		log.Println("Just wait 3 minutes before tests because following procedure is so so so slow ")
 		time.Sleep(3 * time.Minute)
 		log.Println("Wake up, we can test now")
 		Eventually(func() error {

diff --git a/test/pkg/e2eutil/e2eutil.go b/test/pkg/e2eutil/e2eutil.go
@@ -76,9 +76,7 @@ func ServiceHasEIP(c *kubernetes.Clientset, name, namespace, ip string) error {
 	}
 	if len(service.Status.LoadBalancer.Ingress) > 0 {
 		if ip != "" && service.Status.LoadBalancer.Ingress[0].IP != ip {
-			err := fmt.Errorf("got a different ip")
-			log.Println(err.Error())
-			return err
+			return fmt.Errorf("got a different ip")
 		}
 		return nil
 	}