Commit af882afd authored by stewart-yu's avatar stewart-yu

should not ignore return messages from wait function

parent 60cd2800
...@@ -660,7 +660,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv ...@@ -660,7 +660,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
glog.V(2).Infof("LoadBalancer %s already exists", name) glog.V(2).Infof("LoadBalancer %s already exists", name)
} }
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID) provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
if err != nil {
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
}
lbmethod := v2pools.LBMethod(lbaas.opts.LBMethod) lbmethod := v2pools.LBMethod(lbaas.opts.LBMethod)
if lbmethod == "" { if lbmethod == "" {
...@@ -685,7 +688,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv ...@@ -685,7 +688,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
// Unknown error, retry later // Unknown error, retry later
return nil, fmt.Errorf("error creating LB listener: %v", err) return nil, fmt.Errorf("error creating LB listener: %v", err)
} }
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID) provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
if err != nil {
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
}
} }
glog.V(4).Infof("Listener for %s port %d: %s", string(port.Protocol), int(port.Port), listener.ID) glog.V(4).Infof("Listener for %s port %d: %s", string(port.Protocol), int(port.Port), listener.ID)
...@@ -711,7 +717,11 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv ...@@ -711,7 +717,11 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
// Unknown error, retry later // Unknown error, retry later
return nil, fmt.Errorf("error creating pool for listener %s: %v", listener.ID, err) return nil, fmt.Errorf("error creating pool for listener %s: %v", listener.ID, err)
} }
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID) provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
if err != nil {
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
}
} }
glog.V(4).Infof("Pool for listener %s: %s", listener.ID, pool.ID) glog.V(4).Infof("Pool for listener %s: %s", listener.ID, pool.ID)
...@@ -742,7 +752,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv ...@@ -742,7 +752,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
return nil, fmt.Errorf("error creating LB pool member for node: %s, %v", node.Name, err) return nil, fmt.Errorf("error creating LB pool member for node: %s, %v", node.Name, err)
} }
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID) provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
if err != nil {
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
}
} else { } else {
// After all members have been processed, remaining members are deleted as obsolete. // After all members have been processed, remaining members are deleted as obsolete.
members = popMember(members, addr, int(port.NodePort)) members = popMember(members, addr, int(port.NodePort))
...@@ -758,7 +771,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv ...@@ -758,7 +771,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
if err != nil && !isNotFound(err) { if err != nil && !isNotFound(err) {
return nil, fmt.Errorf("error deleting obsolete member %s for pool %s address %s: %v", member.ID, pool.ID, member.Address, err) return nil, fmt.Errorf("error deleting obsolete member %s for pool %s address %s: %v", member.ID, pool.ID, member.Address, err)
} }
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID) provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
if err != nil {
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
}
} }
monitorID := pool.MonitorID monitorID := pool.MonitorID
...@@ -774,7 +790,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv ...@@ -774,7 +790,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
if err != nil { if err != nil {
return nil, fmt.Errorf("error creating LB pool healthmonitor: %v", err) return nil, fmt.Errorf("error creating LB pool healthmonitor: %v", err)
} }
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID) provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
if err != nil {
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
}
monitorID = monitor.ID monitorID = monitor.ID
} else if lbaas.opts.CreateMonitor == false { } else if lbaas.opts.CreateMonitor == false {
glog.V(4).Infof("Do not create monitor for pool %s when create-monitor is false", pool.ID) glog.V(4).Infof("Do not create monitor for pool %s when create-monitor is false", pool.ID)
...@@ -802,7 +821,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv ...@@ -802,7 +821,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
if err != nil && !isNotFound(err) { if err != nil && !isNotFound(err) {
return nil, fmt.Errorf("error deleting obsolete monitor %s for pool %s: %v", monitorID, pool.ID, err) return nil, fmt.Errorf("error deleting obsolete monitor %s for pool %s: %v", monitorID, pool.ID, err)
} }
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID) provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
if err != nil {
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
}
} }
// get and delete pool members // get and delete pool members
members, err := getMembersByPoolID(lbaas.lb, pool.ID) members, err := getMembersByPoolID(lbaas.lb, pool.ID)
...@@ -816,7 +838,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv ...@@ -816,7 +838,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
if err != nil && !isNotFound(err) { if err != nil && !isNotFound(err) {
return nil, fmt.Errorf("error deleting obsolete member %s for pool %s address %s: %v", member.ID, pool.ID, member.Address, err) return nil, fmt.Errorf("error deleting obsolete member %s for pool %s address %s: %v", member.ID, pool.ID, member.Address, err)
} }
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID) provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
if err != nil {
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
}
} }
} }
glog.V(4).Infof("Deleting obsolete pool %s for listener %s", pool.ID, listener.ID) glog.V(4).Infof("Deleting obsolete pool %s for listener %s", pool.ID, listener.ID)
...@@ -825,14 +850,20 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv ...@@ -825,14 +850,20 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
if err != nil && !isNotFound(err) { if err != nil && !isNotFound(err) {
return nil, fmt.Errorf("error deleting obsolete pool %s for listener %s: %v", pool.ID, listener.ID, err) return nil, fmt.Errorf("error deleting obsolete pool %s for listener %s: %v", pool.ID, listener.ID, err)
} }
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID) provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
if err != nil {
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
}
} }
// delete listener // delete listener
err = listeners.Delete(lbaas.lb, listener.ID).ExtractErr() err = listeners.Delete(lbaas.lb, listener.ID).ExtractErr()
if err != nil && !isNotFound(err) { if err != nil && !isNotFound(err) {
return nil, fmt.Errorf("error deleteting obsolete listener: %v", err) return nil, fmt.Errorf("error deleteting obsolete listener: %v", err)
} }
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID) provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
if err != nil {
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
}
glog.V(2).Infof("Deleted obsolete listener: %s", listener.ID) glog.V(2).Infof("Deleted obsolete listener: %s", listener.ID)
} }
...@@ -1168,7 +1199,10 @@ func (lbaas *LbaasV2) UpdateLoadBalancer(clusterName string, service *v1.Service ...@@ -1168,7 +1199,10 @@ func (lbaas *LbaasV2) UpdateLoadBalancer(clusterName string, service *v1.Service
if err != nil { if err != nil {
return err return err
} }
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID) provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
if err != nil {
return fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
}
} }
// Remove any old members for this port // Remove any old members for this port
...@@ -1181,7 +1215,10 @@ func (lbaas *LbaasV2) UpdateLoadBalancer(clusterName string, service *v1.Service ...@@ -1181,7 +1215,10 @@ func (lbaas *LbaasV2) UpdateLoadBalancer(clusterName string, service *v1.Service
if err != nil && !isNotFound(err) { if err != nil && !isNotFound(err) {
return err return err
} }
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID) provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
if err != nil {
return fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
}
} }
} }
...@@ -1342,7 +1379,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1. ...@@ -1342,7 +1379,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1.
if err != nil && !isNotFound(err) { if err != nil && !isNotFound(err) {
return err return err
} }
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID) provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
if err != nil {
return fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
}
} }
// delete all members and pools // delete all members and pools
...@@ -1353,7 +1393,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1. ...@@ -1353,7 +1393,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1.
if err != nil && !isNotFound(err) { if err != nil && !isNotFound(err) {
return err return err
} }
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID) provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
if err != nil {
return fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
}
} }
// delete pool // delete pool
...@@ -1361,7 +1404,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1. ...@@ -1361,7 +1404,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1.
if err != nil && !isNotFound(err) { if err != nil && !isNotFound(err) {
return err return err
} }
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID) provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
if err != nil {
return fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
}
} }
// delete all listeners // delete all listeners
...@@ -1370,7 +1416,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1. ...@@ -1370,7 +1416,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1.
if err != nil && !isNotFound(err) { if err != nil && !isNotFound(err) {
return err return err
} }
waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID) provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
if err != nil {
return fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
}
} }
// delete loadbalancer // delete loadbalancer
...@@ -1378,7 +1427,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1. ...@@ -1378,7 +1427,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1.
if err != nil && !isNotFound(err) { if err != nil && !isNotFound(err) {
return err return err
} }
waitLoadbalancerDeleted(lbaas.lb, loadbalancer.ID) err = waitLoadbalancerDeleted(lbaas.lb, loadbalancer.ID)
if err != nil {
return fmt.Errorf("failed to delete loadbalancer: %v", err)
}
// Delete the Security Group // Delete the Security Group
if lbaas.opts.ManageSecurityGroups { if lbaas.opts.ManageSecurityGroups {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment