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>
76 lines
2.5 KiB
Protocol Buffer
76 lines
2.5 KiB
Protocol Buffer
syntax = "proto3";
|
|
|
|
import "gogoproto/gogo.proto";
|
|
|
|
package libnetwork;
|
|
|
|
option (gogoproto.marshaler_all) = true;
|
|
option (gogoproto.unmarshaler_all) = true;
|
|
option (gogoproto.stringer_all) = true;
|
|
option (gogoproto.gostring_all) = true;
|
|
option (gogoproto.sizer_all) = true;
|
|
option (gogoproto.goproto_stringer_all) = false;
|
|
|
|
// EndpointRecord specifies all the endpoint specific information that
|
|
// needs to gossiped to nodes participating in the network.
|
|
message EndpointRecord {
|
|
// Name of the container
|
|
string name = 1;
|
|
|
|
// Service name of the service to which this endpoint belongs.
|
|
string service_name = 2;
|
|
|
|
// Service ID of the service to which this endpoint belongs.
|
|
string service_id = 3 [(gogoproto.customname) = "ServiceID"];
|
|
|
|
// Virtual IP of the service to which this endpoint belongs.
|
|
string virtual_ip = 4 [(gogoproto.customname) = "VirtualIP"];
|
|
|
|
// IP assigned to this endpoint.
|
|
string endpoint_ip = 5 [(gogoproto.customname) = "EndpointIP"];
|
|
|
|
// IngressPorts exposed by the service to which this endpoint belongs.
|
|
repeated PortConfig ingress_ports = 6;
|
|
|
|
// A list of aliases which are alternate names for the service
|
|
repeated string aliases = 7;
|
|
|
|
// List of aliases task specific aliases
|
|
repeated string task_aliases = 8;
|
|
|
|
// Whether this enpoint's service has been disabled
|
|
bool service_disabled = 9;
|
|
}
|
|
|
|
// PortConfig specifies an exposed port which can be
|
|
// addressed using the given name. This can be later queried
|
|
// using a service discovery api or a DNS SRV query. The node
|
|
// port specifies a port that can be used to address this
|
|
// service external to the cluster by sending a connection
|
|
// request to this port to any node on the cluster.
|
|
message PortConfig {
|
|
enum Protocol {
|
|
option (gogoproto.goproto_enum_prefix) = false;
|
|
|
|
TCP = 0 [(gogoproto.enumvalue_customname) = "ProtocolTCP"];
|
|
UDP = 1 [(gogoproto.enumvalue_customname) = "ProtocolUDP"];
|
|
SCTP = 2 [(gogoproto.enumvalue_customname) = "ProtocolSCTP"];
|
|
}
|
|
|
|
// Name for the port. If provided the port information can
|
|
// be queried using the name as in a DNS SRV query.
|
|
string name = 1;
|
|
|
|
// Protocol for the port which is exposed.
|
|
Protocol protocol = 2;
|
|
|
|
// The port which the application is exposing and is bound to.
|
|
uint32 target_port = 3;
|
|
|
|
// PublishedPort specifies the port on which the service is
|
|
// exposed on all nodes on the cluster. If not specified an
|
|
// arbitrary port in the node port range is allocated by the
|
|
// system. If specified it should be within the node port
|
|
// range and it should be available.
|
|
uint32 published_port = 4;
|
|
}
|