Skip to content

Commit

Permalink
[exporter/loadbalancing] Update k8sresolver handler to properly manag…
Browse files Browse the repository at this point in the history
…e update events (#36505)

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description
The load balancing exporter's k8sresolver was not handling update events
properly. The `callback` function was being executed after cleanup of
old endpoints and also after adding new endpoints. This causes exporter
churn in the case of an event in which the lists contain shared
elements. See the
[documentation](https://pkg.go.dev/k8s.io/client-go/tools/cache#ResourceEventHandler)
for examples where the state might change but the IP Addresses would
not, including the regular re-list events that might have zero changes.

<!-- Issue number (e.g. #1234) or full URL to issue, if applicable. -->
#### Link to tracking issue
Fixes
#35658
May be related to
#35810
as well.

<!--Describe what testing was performed and which tests were added.-->
#### Testing
Added tests for no-change onChange call.

<!--Please delete paragraphs that you did not use before submitting.-->
  • Loading branch information
dehaansa authored Nov 27, 2024
1 parent 6c43968 commit af5200a
Show file tree
Hide file tree
Showing 3 changed files with 91 additions and 16 deletions.
27 changes: 27 additions & 0 deletions .chloggen/single-callback-k8sresolver.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: loadbalancingexporter

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: The k8sresolver in loadbalancingexporter was triggering exporter churn in the way the change event was handled.

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [35658]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
40 changes: 24 additions & 16 deletions exporter/loadbalancingexporter/resolver_k8s_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ type handler struct {
}

func (h handler) OnAdd(obj any, _ bool) {
var endpoints []string
var endpoints map[string]bool

switch object := obj.(type) {
case *corev1.Endpoints:
Expand All @@ -36,7 +36,7 @@ func (h handler) OnAdd(obj any, _ bool) {
return
}
changed := false
for _, ep := range endpoints {
for ep := range endpoints {
if _, loaded := h.endpoints.LoadOrStore(ep, true); !loaded {
changed = true
}
Expand All @@ -49,28 +49,36 @@ func (h handler) OnAdd(obj any, _ bool) {
func (h handler) OnUpdate(oldObj, newObj any) {
switch oldEps := oldObj.(type) {
case *corev1.Endpoints:
epRemove := convertToEndpoints(oldEps)
for _, ep := range epRemove {
h.endpoints.Delete(ep)
}
if len(epRemove) > 0 {
_, _ = h.callback(context.Background())
}

newEps, ok := newObj.(*corev1.Endpoints)
if !ok {
h.logger.Warn("Got an unexpected Kubernetes data type during the update of the pods for a service", zap.Any("obj", newObj))
h.telemetry.LoadbalancerNumResolutions.Add(context.Background(), 1, metric.WithAttributeSet(k8sResolverFailureAttrSet))
return
}

oldEndpoints := convertToEndpoints(oldEps)
newEndpoints := convertToEndpoints(newEps)
changed := false
for _, ep := range convertToEndpoints(newEps) {

// Iterate through old endpoints and remove those that are not in the new list.
for ep := range oldEndpoints {
if _, ok := newEndpoints[ep]; !ok {
h.endpoints.Delete(ep)
changed = true
}
}

// Iterate through new endpoints and add those that are not in the endpoints map already.
for ep := range newEndpoints {
if _, loaded := h.endpoints.LoadOrStore(ep, true); !loaded {
changed = true
}
}

if changed {
_, _ = h.callback(context.Background())
} else {
h.logger.Debug("No changes detected in the endpoints for the service", zap.Any("old", oldEps), zap.Any("new", newEps))
}
default: // unsupported
h.logger.Warn("Got an unexpected Kubernetes data type during the update of the pods for a service", zap.Any("obj", oldObj))
Expand All @@ -80,7 +88,7 @@ func (h handler) OnUpdate(oldObj, newObj any) {
}

func (h handler) OnDelete(obj any) {
var endpoints []string
var endpoints map[string]bool
switch object := obj.(type) {
case *cache.DeletedFinalStateUnknown:
h.OnDelete(object.Obj)
Expand All @@ -95,19 +103,19 @@ func (h handler) OnDelete(obj any) {
return
}
if len(endpoints) != 0 {
for _, endpoint := range endpoints {
for endpoint := range endpoints {
h.endpoints.Delete(endpoint)
}
_, _ = h.callback(context.Background())
}
}

func convertToEndpoints(eps ...*corev1.Endpoints) []string {
var ipAddress []string
func convertToEndpoints(eps ...*corev1.Endpoints) map[string]bool {
ipAddress := map[string]bool{}
for _, ep := range eps {
for _, subsets := range ep.Subsets {
for _, addr := range subsets.Addresses {
ipAddress = append(ipAddress, addr.IP)
ipAddress[addr.IP] = true
}
}
}
Expand Down
40 changes: 40 additions & 0 deletions exporter/loadbalancingexporter/resolver_k8s_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ func TestK8sResolve(t *testing.T) {
name string
args args
simulateFn func(*suiteContext, args) error
onChangeFn func([]string)
verifyFn func(*suiteContext, args) error
}{
{
Expand Down Expand Up @@ -116,6 +117,41 @@ func TestK8sResolve(t *testing.T) {
return nil
},
},
{
name: "simulate re-list that does not change endpoints",
args: args{
logger: zap.NewNop(),
service: "lb",
namespace: "default",
ports: []int32{8080, 9090},
},
simulateFn: func(suiteCtx *suiteContext, args args) error {
exist := suiteCtx.endpoint.DeepCopy()
patch := client.MergeFrom(exist)
data, err := patch.Data(exist)
if err != nil {
return err
}
_, err = suiteCtx.clientset.CoreV1().Endpoints(args.namespace).
Patch(context.TODO(), args.service, types.MergePatchType, data, metav1.PatchOptions{})
return err
},
onChangeFn: func([]string) {
assert.Fail(t, "should not call onChange")
},
verifyFn: func(ctx *suiteContext, _ args) error {
if _, err := ctx.resolver.resolve(context.Background()); err != nil {
return err
}

assert.Equal(t, []string{
"192.168.10.100:8080",
"192.168.10.100:9090",
}, ctx.resolver.Endpoints(), "resolver failed, endpoints not equal")

return nil
},
},
{
name: "simulate change the backend ip address",
args: args{
Expand Down Expand Up @@ -177,6 +213,10 @@ func TestK8sResolve(t *testing.T) {
suiteCtx, teardownSuite := setupSuite(t, tt.args)
defer teardownSuite(t)

if tt.onChangeFn != nil {
suiteCtx.resolver.onChange(tt.onChangeFn)
}

err := tt.simulateFn(suiteCtx, tt.args)
assert.NoError(t, err)

Expand Down

0 comments on commit af5200a

Please sign in to comment.