Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Openstack: Update lb member when node port changes #34426

Merged
merged 1 commit into from
Oct 15, 2016
Merged

Openstack: Update lb member when node port changes #34426

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 10 additions & 9 deletions pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,9 @@ func getMonitorByPoolID(client *gophercloud.ServiceClient, id string) (*v2_monit
}

// Check if a member exists for node
func memberExists(members []v2_pools.Member, addr string) bool {
func memberExists(members []v2_pools.Member, addr string, port int) bool {
for _, member := range members {
if member.Address == addr {
if member.Address == addr && member.ProtocolPort == port {
return true
}
}
Expand All @@ -385,9 +385,9 @@ func popListener(existingListeners []listeners.Listener, id string) []listeners.
return existingListeners
}

func popMember(members []v2_pools.Member, addr string) []v2_pools.Member {
func popMember(members []v2_pools.Member, addr string, port int) []v2_pools.Member {
for i, member := range members {
if member.Address == addr {
if member.Address == addr && member.ProtocolPort == port {
members[i] = members[len(members)-1]
members = members[:len(members)-1]
}
Expand Down Expand Up @@ -602,7 +602,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *api.Ser
}
}

if !memberExists(members, addr) {
if !memberExists(members, addr, int(port.NodePort)) {
glog.V(4).Infof("Creating member for pool %s", pool.ID)
_, err := v2_pools.CreateAssociateMember(lbaas.network, pool.ID, v2_pools.MemberCreateOpts{
ProtocolPort: int(port.NodePort),
Expand All @@ -614,9 +614,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *api.Ser
}

waitLoadbalancerActiveProvisioningStatus(lbaas.network, loadbalancer.ID)
} else {
// After all members have been processed, remaining members are deleted as obsolete.
members = popMember(members, addr, int(port.NodePort))
}
// After all members have been processed, remaining members are deleted as obsolete.
members = popMember(members, addr)

glog.V(4).Infof("Ensured pool %s has member for %s at %s", pool.ID, nodeName, addr)
}
Expand Down Expand Up @@ -832,7 +833,7 @@ func (lbaas *LbaasV2) UpdateLoadBalancer(clusterName string, service *api.Servic

// Add any new members for this port
for addr := range addrs {
if _, ok := members[addr]; ok {
if _, ok := members[addr]; ok && members[addr].ProtocolPort == int(port.NodePort) {
// Already exists, do not create member
continue
}
Expand All @@ -849,7 +850,7 @@ func (lbaas *LbaasV2) UpdateLoadBalancer(clusterName string, service *api.Servic

// Remove any old members for this port
for _, member := range members {
if _, ok := addrs[member.Address]; ok {
if _, ok := addrs[member.Address]; ok && member.ProtocolPort == int(port.NodePort) {
// Still present, do not delete member
continue
}
Expand Down