github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

use sets.String for tracking IPVS no local endpoint metric

Browse Source
This commit is contained in:
Max Renaud 2022-03-30 02:45:32 +00:00
parent f0dfac5d07
commit ba4f5c4e7b
2 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
pkg/proxy/ipvs/proxier.go
View File

@ -273,16 +273,20 @@ type Proxier struct {
// Inject for test purpose. // Inject for test purpose.
networkInterfacer utilproxy.NetworkInterfacer networkInterfacer utilproxy.NetworkInterfacer
gracefuldeleteManager *GracefulTerminationManager gracefuldeleteManager *GracefulTerminationManager
// serviceNoLocalEndpointsInternal is a map of services that couldn't have their rules applied // serviceNoLocalEndpointsInternal represents the set of services that couldn't be applied
// due to the absence of local endpoints when the internal traffic policy label set to "Local". // due to the absence of local endpoints when the internal traffic policy is "Local".
// It is used to publish the sync_proxy_rules_no_endpoints_total // It is used to publish the sync_proxy_rules_no_endpoints_total
// metric with the traffic_policy label set to "internal". // metric with the traffic_policy label set to "internal".
serviceNoLocalEndpointsInternal map[proxy.ServicePortName]bool // sets.String is used here since we end up calculating endpoint topology multiple times for the same Service
// serviceNoLocalEndpointsExternal is a map of services that couldn't have their rules applied // if it has mulitple ports but each Service should only be counted once.
serviceNoLocalEndpointsInternal sets.String
// serviceNoLocalEndpointsExternal irepresents the set of services that couldn't be applied
// due to the absence of any endpoints when the external traffic policy is "Local". // due to the absence of any endpoints when the external traffic policy is "Local".
// It is used to publish the sync_proxy_rules_no_endpoints_total // It is used to publish the sync_proxy_rules_no_endpoints_total
// metric with the traffic_policy label set to "external". // metric with the traffic_policy label set to "external".
serviceNoLocalEndpointsExternal map[proxy.ServicePortName]bool // sets.String is used here since we end up calculating endpoint topology multiple times for the same Service
// if it has mulitple ports but each Service should only be counted once.
serviceNoLocalEndpointsExternal sets.String
} }
// IPGetter helps get node network interface IP and IPs binded to the IPVS dummy interface // IPGetter helps get node network interface IP and IPs binded to the IPVS dummy interface
@ -1037,8 +1041,8 @@ func (proxier *Proxier) syncProxyRules() {
klog.V(3).InfoS("Syncing ipvs proxier rules") klog.V(3).InfoS("Syncing ipvs proxier rules")
proxier.serviceNoLocalEndpointsInternal = make(map[proxy.ServicePortName]bool) proxier.serviceNoLocalEndpointsInternal = sets.NewString()
proxier.serviceNoLocalEndpointsExternal = make(map[proxy.ServicePortName]bool) proxier.serviceNoLocalEndpointsExternal = sets.NewString()
// Begin install iptables // Begin install iptables
// Reset all buffers used later. // Reset all buffers used later.
@ -1612,23 +1616,8 @@ func (proxier *Proxier) syncProxyRules() {
} }
proxier.deleteEndpointConnections(endpointUpdateResult.StaleEndpoints) proxier.deleteEndpointConnections(endpointUpdateResult.StaleEndpoints)
serviceNoLocalEndpointsInternalTotal := 0 metrics.SyncProxyRulesNoLocalEndpointsTotal.WithLabelValues("internal").Set(float64(proxier.serviceNoLocalEndpointsInternal.Len()))
serviceNoLocalEndpointsExternalTotal := 0 metrics.SyncProxyRulesNoLocalEndpointsTotal.WithLabelValues("external").Set(float64(proxier.serviceNoLocalEndpointsExternal.Len()))
for _, v := range proxier.serviceNoLocalEndpointsInternal {
if v {
serviceNoLocalEndpointsInternalTotal++
}
}
for _, v := range proxier.serviceNoLocalEndpointsExternal {
if v {
serviceNoLocalEndpointsExternalTotal++
}
}
metrics.SyncProxyRulesNoLocalEndpointsTotal.WithLabelValues("internal").Set(float64(serviceNoLocalEndpointsInternalTotal))
metrics.SyncProxyRulesNoLocalEndpointsTotal.WithLabelValues("external").Set(float64(serviceNoLocalEndpointsExternalTotal))
} }
// writeIptablesRules write all iptables rules to proxier.natRules or proxier.FilterRules that ipvs proxier needed // writeIptablesRules write all iptables rules to proxier.natRules or proxier.FilterRules that ipvs proxier needed
@ -1992,7 +1981,6 @@ func (proxier *Proxier) syncEndpoint(svcPortName proxy.ServicePortName, onlyNode
endpoints := proxier.endpointsMap[svcPortName] endpoints := proxier.endpointsMap[svcPortName]
localEndpoints := []proxy.Endpoint{}
// Filtering for topology aware endpoints. This function will only // Filtering for topology aware endpoints. This function will only
// filter endpoints if appropriate feature gates are enabled and the // filter endpoints if appropriate feature gates are enabled and the
// Service does not have conflicting configuration such as // Service does not have conflicting configuration such as
@ -2001,8 +1989,7 @@ func (proxier *Proxier) syncEndpoint(svcPortName proxy.ServicePortName, onlyNode
if !ok { if !ok {
klog.InfoS("Unable to filter endpoints due to missing service info", "servicePortName", svcPortName) klog.InfoS("Unable to filter endpoints due to missing service info", "servicePortName", svcPortName)
} else { } else {
var clusterEndpoints []proxy.Endpoint clusterEndpoints, localEndpoints, _, _ := proxy.CategorizeEndpoints(endpoints, svcInfo, proxier.nodeLabels)
clusterEndpoints, localEndpoints, _, _ = proxy.CategorizeEndpoints(endpoints, svcInfo, proxier.nodeLabels)
if onlyNodeLocalEndpoints { if onlyNodeLocalEndpoints {
if len(localEndpoints) > 0 { if len(localEndpoints) > 0 {
endpoints = localEndpoints endpoints = localEndpoints
@ -2022,13 +2009,13 @@ func (proxier *Proxier) syncEndpoint(svcPortName proxy.ServicePortName, onlyNode
for _, epInfo := range endpoints { for _, epInfo := range endpoints {
newEndpoints.Insert(epInfo.String()) newEndpoints.Insert(epInfo.String())
} }
if svcInfo.UsesLocalEndpoints() && len(localEndpoints) == 0 { if onlyNodeLocalEndpoints && len(newEndpoints) == 0 {
if svcInfo.NodeLocalInternal() && utilfeature.DefaultFeatureGate.Enabled(features.ServiceInternalTrafficPolicy) { if svcInfo.NodeLocalInternal() && utilfeature.DefaultFeatureGate.Enabled(features.ServiceInternalTrafficPolicy) {
proxier.serviceNoLocalEndpointsInternal[svcPortName] = true proxier.serviceNoLocalEndpointsInternal.Insert(svcPortName.NamespacedName.String())
} }
if svcInfo.NodeLocalExternal() { if svcInfo.NodeLocalExternal() {
proxier.serviceNoLocalEndpointsExternal[svcPortName] = true proxier.serviceNoLocalEndpointsExternal.Insert(svcPortName.NamespacedName.String())
} }
} }

8
pkg/proxy/ipvs/proxier_test.go
View File

@ -5865,7 +5865,7 @@ func TestNoEndpointsMetric(t *testing.T) {
ipt := iptablestest.NewFake() ipt := iptablestest.NewFake()
ipvs := ipvstest.NewFake() ipvs := ipvstest.NewFake()
ipset := ipsettest.NewFake(testIPSetVersion) ipset := ipsettest.NewFake(testIPSetVersion)
fp := NewFakeProxier(ipt, ipvs, ipset, nil, nil, v1.IPv4Protocol) fp := NewFakeProxier(ipt, ipvs, ipset, []net.IP{netutils.ParseIPSloppy("10.0.0.1")}, nil, v1.IPv4Protocol)
fp.servicesSynced = true fp.servicesSynced = true
// fp.endpointsSynced = true // fp.endpointsSynced = true
fp.endpointSlicesSynced = true fp.endpointSlicesSynced = true
@ -5879,7 +5879,7 @@ func TestNoEndpointsMetric(t *testing.T) {
Spec: v1.ServiceSpec{ Spec: v1.ServiceSpec{
ClusterIP: "172.20.1.1", ClusterIP: "172.20.1.1",
Selector: map[string]string{"foo": "bar"}, Selector: map[string]string{"foo": "bar"},
Ports: []v1.ServicePort{{Name: "", TargetPort: intstr.FromInt(80), Protocol: v1.ProtocolTCP, NodePort: 123}}, Ports: []v1.ServicePort{{Name: "p80", Port: 80, TargetPort: intstr.FromInt(80), Protocol: v1.ProtocolTCP, NodePort: 30000}},
}, },
} }
if tc.internalTrafficPolicy != nil { if tc.internalTrafficPolicy != nil {
@ -5901,7 +5901,7 @@ func TestNoEndpointsMetric(t *testing.T) {
Labels: map[string]string{discovery.LabelServiceName: serviceName}, Labels: map[string]string{discovery.LabelServiceName: serviceName},
}, },
Ports: []discovery.EndpointPort{{ Ports: []discovery.EndpointPort{{
Name: utilpointer.StringPtr(""), Name: utilpointer.StringPtr("p80"),
Port: utilpointer.Int32Ptr(80), Port: utilpointer.Int32Ptr(80),
Protocol: &tcpProtocol, Protocol: &tcpProtocol,
}}, }},
@ -5934,7 +5934,7 @@ func TestNoEndpointsMetric(t *testing.T) {
} }
if tc.expectedSyncProxyRulesNoLocalEndpointsTotalExternal != int(syncProxyRulesNoLocalEndpointsTotalExternal) { if tc.expectedSyncProxyRulesNoLocalEndpointsTotalExternal != int(syncProxyRulesNoLocalEndpointsTotalExternal) {
t.Errorf("sync_proxy_rules_no_endpoints_total metric mismatch(internal): got=%d, expected %d", int(syncProxyRulesNoLocalEndpointsTotalExternal), tc.expectedSyncProxyRulesNoLocalEndpointsTotalExternal) t.Errorf("sync_proxy_rules_no_endpoints_total metric mismatch(external): got=%d, expected %d", int(syncProxyRulesNoLocalEndpointsTotalExternal), tc.expectedSyncProxyRulesNoLocalEndpointsTotalExternal)
} }
} }
} }