Skip to content
This repository was archived by the owner on Mar 22, 2018. It is now read-only.

Commit fb1a6d6

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request #56678 from stewart-yu/deleteWhitespaceInLog
Automatic merge from submit-queue (batch tested with PRs 57122, 57142, 57016, 56927, 56678). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. should not ignore return messages from wait function **What this PR does / why we need it**: It should not ignore return messages for `wait*` function. When it go wrong, need `return` at once. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
2 parents 608abe2 + 6b8b331 commit fb1a6d6

1 file changed

Lines changed: 69 additions & 17 deletions

File tree

‎pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go‎

Lines changed: 69 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
714714
glog.V(2).Infof("LoadBalancer %s already exists", name)
715715
}
716716

717-
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
717+
provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
718+
if err != nil {
719+
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
720+
}
718721

719722
lbmethod := v2pools.LBMethod(lbaas.opts.LBMethod)
720723
if lbmethod == "" {
@@ -739,7 +742,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
739742
// Unknown error, retry later
740743
return nil, fmt.Errorf("error creating LB listener: %v", err)
741744
}
742-
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
745+
provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
746+
if err != nil {
747+
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
748+
}
743749
}
744750

745751
glog.V(4).Infof("Listener for %s port %d: %s", string(port.Protocol), int(port.Port), listener.ID)
@@ -765,7 +771,11 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
765771
// Unknown error, retry later
766772
return nil, fmt.Errorf("error creating pool for listener %s: %v", listener.ID, err)
767773
}
768-
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
774+
provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
775+
if err != nil {
776+
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
777+
}
778+
769779
}
770780

771781
glog.V(4).Infof("Pool for listener %s: %s", listener.ID, pool.ID)
@@ -796,7 +806,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
796806
return nil, fmt.Errorf("error creating LB pool member for node: %s, %v", node.Name, err)
797807
}
798808

799-
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
809+
provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
810+
if err != nil {
811+
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
812+
}
800813
} else {
801814
// After all members have been processed, remaining members are deleted as obsolete.
802815
members = popMember(members, addr, int(port.NodePort))
@@ -812,7 +825,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
812825
if err != nil && !isNotFound(err) {
813826
return nil, fmt.Errorf("error deleting obsolete member %s for pool %s address %s: %v", member.ID, pool.ID, member.Address, err)
814827
}
815-
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
828+
provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
829+
if err != nil {
830+
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
831+
}
816832
}
817833

818834
monitorID := pool.MonitorID
@@ -828,7 +844,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
828844
if err != nil {
829845
return nil, fmt.Errorf("error creating LB pool healthmonitor: %v", err)
830846
}
831-
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
847+
provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
848+
if err != nil {
849+
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
850+
}
832851
monitorID = monitor.ID
833852
} else if lbaas.opts.CreateMonitor == false {
834853
glog.V(4).Infof("Do not create monitor for pool %s when create-monitor is false", pool.ID)
@@ -856,7 +875,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
856875
if err != nil && !isNotFound(err) {
857876
return nil, fmt.Errorf("error deleting obsolete monitor %s for pool %s: %v", monitorID, pool.ID, err)
858877
}
859-
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
878+
provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
879+
if err != nil {
880+
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
881+
}
860882
}
861883
// get and delete pool members
862884
members, err := getMembersByPoolID(lbaas.lb, pool.ID)
@@ -870,7 +892,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
870892
if err != nil && !isNotFound(err) {
871893
return nil, fmt.Errorf("error deleting obsolete member %s for pool %s address %s: %v", member.ID, pool.ID, member.Address, err)
872894
}
873-
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
895+
provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
896+
if err != nil {
897+
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
898+
}
874899
}
875900
}
876901
glog.V(4).Infof("Deleting obsolete pool %s for listener %s", pool.ID, listener.ID)
@@ -879,14 +904,20 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
879904
if err != nil && !isNotFound(err) {
880905
return nil, fmt.Errorf("error deleting obsolete pool %s for listener %s: %v", pool.ID, listener.ID, err)
881906
}
882-
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
907+
provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
908+
if err != nil {
909+
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
910+
}
883911
}
884912
// delete listener
885913
err = listeners.Delete(lbaas.lb, listener.ID).ExtractErr()
886914
if err != nil && !isNotFound(err) {
887915
return nil, fmt.Errorf("error deleteting obsolete listener: %v", err)
888916
}
889-
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
917+
provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
918+
if err != nil {
919+
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
920+
}
890921
glog.V(2).Infof("Deleted obsolete listener: %s", listener.ID)
891922
}
892923

@@ -1222,7 +1253,10 @@ func (lbaas *LbaasV2) UpdateLoadBalancer(clusterName string, service *v1.Service
12221253
if err != nil {
12231254
return err
12241255
}
1225-
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
1256+
provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
1257+
if err != nil {
1258+
return fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
1259+
}
12261260
}
12271261

12281262
// Remove any old members for this port
@@ -1235,7 +1269,10 @@ func (lbaas *LbaasV2) UpdateLoadBalancer(clusterName string, service *v1.Service
12351269
if err != nil && !isNotFound(err) {
12361270
return err
12371271
}
1238-
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
1272+
provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
1273+
if err != nil {
1274+
return fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
1275+
}
12391276
}
12401277
}
12411278

@@ -1396,7 +1433,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1.
13961433
if err != nil && !isNotFound(err) {
13971434
return err
13981435
}
1399-
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
1436+
provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
1437+
if err != nil {
1438+
return fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
1439+
}
14001440
}
14011441

14021442
// delete all members and pools
@@ -1407,15 +1447,21 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1.
14071447
if err != nil && !isNotFound(err) {
14081448
return err
14091449
}
1410-
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
1450+
provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
1451+
if err != nil {
1452+
return fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
1453+
}
14111454
}
14121455

14131456
// delete pool
14141457
err := v2pools.Delete(lbaas.lb, poolID).ExtractErr()
14151458
if err != nil && !isNotFound(err) {
14161459
return err
14171460
}
1418-
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
1461+
provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
1462+
if err != nil {
1463+
return fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
1464+
}
14191465
}
14201466

14211467
// delete all listeners
@@ -1424,15 +1470,21 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1.
14241470
if err != nil && !isNotFound(err) {
14251471
return err
14261472
}
1427-
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
1473+
provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
1474+
if err != nil {
1475+
return fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
1476+
}
14281477
}
14291478

14301479
// delete loadbalancer
14311480
err = loadbalancers.Delete(lbaas.lb, loadbalancer.ID).ExtractErr()
14321481
if err != nil && !isNotFound(err) {
14331482
return err
14341483
}
1435-
waitLoadbalancerDeleted(lbaas.lb, loadbalancer.ID)
1484+
err = waitLoadbalancerDeleted(lbaas.lb, loadbalancer.ID)
1485+
if err != nil {
1486+
return fmt.Errorf("failed to delete loadbalancer: %v", err)
1487+
}
14361488

14371489
// Delete the Security Group
14381490
if lbaas.opts.ManageSecurityGroups {

0 commit comments

Comments
 (0)