mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
7d7412f957
This patch attempts to allow endpoints to complete servicing connections while being removed from a service. The change adds a flag to the endpoint.deleteServiceInfoFromCluster() method to indicate whether this removal should fully remove connectivity through the load balancer to the endpoint or should just disable directing further connections to the endpoint. If the flag is 'false', then the load balancer assigns a weight of 0 to the endpoint but does not remove it as a linux load balancing destination. It does remove the endpoint as a docker load balancing endpoint but tracks it in a special map of "disabled-but-not- destroyed" load balancing endpoints. This allows traffic to continue flowing, at least under Linux. If the flag is 'true', then the code removes the endpoint entirely as a load balancing destination. The sandbox.DisableService() method invokes deleteServiceInfoFromCluster() with the flag sent to 'false', while the endpoint.sbLeave() method invokes it with the flag set to 'true' to complete the removal on endpoint finalization. Renaming the endpoint invokes deleteServiceInfoFromCluster() with the flag set to 'true' because renaming attempts to completely remove and then re-add each endpoint service entry. The controller.rmServiceBinding() method, which carries out the operation, similarly gets a new flag for whether to fully remove the endpoint. If the flag is false, it does the job of moving the endpoint from the load balancing set to the 'disabled' set. It then removes or de-weights the entry in the OS load balancing table via network.rmLBBackend(). It removes the service entirely via said method ONLY IF there are no more live or disabled load balancing endpoints. Similarly network.addLBBackend() requires slight tweaking to properly manage the disabled set. Finally, this change requires propagating the status of disabled service endpoints via the networkDB. Accordingly, the patch includes both code to generate and handle service update messages. It also augments the service structure with a ServiceDisabled boolean to convey whether an endpoint should ultimately be removed or just disabled. This, naturally, required a rebuild of the protocol buffer code as well. Signed-off-by: Chris Telfer <ctelfer@docker.com>
98 lines
2.3 KiB
Go
98 lines
2.3 KiB
Go
package libnetwork
|
|
|
|
import (
|
|
"fmt"
|
|
"net"
|
|
"sync"
|
|
|
|
"github.com/docker/libnetwork/common"
|
|
)
|
|
|
|
var (
|
|
// A global monotonic counter to assign firewall marks to
|
|
// services.
|
|
fwMarkCtr uint32 = 256
|
|
fwMarkCtrMu sync.Mutex
|
|
)
|
|
|
|
type portConfigs []*PortConfig
|
|
|
|
func (p portConfigs) String() string {
|
|
if len(p) == 0 {
|
|
return ""
|
|
}
|
|
|
|
pc := p[0]
|
|
str := fmt.Sprintf("%d:%d/%s", pc.PublishedPort, pc.TargetPort, PortConfig_Protocol_name[int32(pc.Protocol)])
|
|
for _, pc := range p[1:] {
|
|
str = str + fmt.Sprintf(",%d:%d/%s", pc.PublishedPort, pc.TargetPort, PortConfig_Protocol_name[int32(pc.Protocol)])
|
|
}
|
|
|
|
return str
|
|
}
|
|
|
|
type serviceKey struct {
|
|
id string
|
|
ports string
|
|
}
|
|
|
|
type service struct {
|
|
name string // Service Name
|
|
id string // Service ID
|
|
|
|
// Map of loadbalancers for the service one-per attached
|
|
// network. It is keyed with network ID.
|
|
loadBalancers map[string]*loadBalancer
|
|
|
|
// List of ingress ports exposed by the service
|
|
ingressPorts portConfigs
|
|
|
|
// Service aliases
|
|
aliases []string
|
|
|
|
// This maps tracks for each IP address the list of endpoints ID
|
|
// associated with it. At stable state the endpoint ID expected is 1
|
|
// but during transition and service change it is possible to have
|
|
// temporary more than 1
|
|
ipToEndpoint common.SetMatrix
|
|
|
|
deleted bool
|
|
|
|
sync.Mutex
|
|
}
|
|
|
|
// assignIPToEndpoint inserts the mapping between the IP and the endpoint identifier
|
|
// returns true if the mapping was not present, false otherwise
|
|
// returns also the number of endpoints associated to the IP
|
|
func (s *service) assignIPToEndpoint(ip, eID string) (bool, int) {
|
|
return s.ipToEndpoint.Insert(ip, eID)
|
|
}
|
|
|
|
// removeIPToEndpoint removes the mapping between the IP and the endpoint identifier
|
|
// returns true if the mapping was deleted, false otherwise
|
|
// returns also the number of endpoints associated to the IP
|
|
func (s *service) removeIPToEndpoint(ip, eID string) (bool, int) {
|
|
return s.ipToEndpoint.Remove(ip, eID)
|
|
}
|
|
|
|
func (s *service) printIPToEndpoint(ip string) (string, bool) {
|
|
return s.ipToEndpoint.String(ip)
|
|
}
|
|
|
|
type lbBackend struct {
|
|
ip net.IP
|
|
disabled bool
|
|
}
|
|
|
|
type loadBalancer struct {
|
|
vip net.IP
|
|
fwMark uint32
|
|
|
|
// Map of backend IPs backing this loadbalancer on this
|
|
// network. It is keyed with endpoint ID.
|
|
backEnds map[string]*lbBackend
|
|
|
|
// Back pointer to service to which the loadbalancer belongs.
|
|
service *service
|
|
sync.Mutex
|
|
}
|