Node removal latency metrics added #8485
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
There was a problem hiding this comment. Names of the test file and file implementation do not match. There was a problem hiding this comment. I don't see any test checking the reported value. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| /* | ||
| Copyright 2024 The Kubernetes Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, | ||
| software distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package latencytracker | ||
|
|
||
| import ( | ||
| "sync" | ||
| "testing" | ||
| "time" | ||
| ) | ||
|
|
||
| func TestUpdateStateWithUnneededList_AddsNewNodes(t *testing.T) { | ||
| tracker := NewNodeLatencyTracker() | ||
| now := time.Now() | ||
| node := NodeInfo{Name: "node1", UnneededSince: now, Threshold: 5 * time.Minute} | ||
|
|
||
| tracker.UpdateStateWithUnneededList([]NodeInfo{node}, now) | ||
|
|
||
| tracker.Lock() | ||
| defer tracker.Unlock() | ||
| if _, ok := tracker.nodes["node1"]; !ok { | ||
| t.Errorf("expected node1 to be tracked, but was not") | ||
| } | ||
| } | ||
|
|
||
| func TestUpdateStateWithUnneededList_DoesNotDuplicate(t *testing.T) { | ||
| tracker := NewNodeLatencyTracker() | ||
| now := time.Now() | ||
| node := NodeInfo{Name: "node1", UnneededSince: now, Threshold: 5 * time.Minute} | ||
|
|
||
| tracker.UpdateStateWithUnneededList([]NodeInfo{node}, now) | ||
| tracker.UpdateStateWithUnneededList([]NodeInfo{node}, now.Add(time.Minute)) | ||
|
|
||
| tracker.Lock() | ||
| defer tracker.Unlock() | ||
| if len(tracker.nodes) != 1 { | ||
| t.Errorf("expected 1 tracked node, got %d", len(tracker.nodes)) | ||
| } | ||
| } | ||
|
|
||
| func TestObserveDeletion_RemovesNode(t *testing.T) { | ||
| tracker := NewNodeLatencyTracker() | ||
| now := time.Now() | ||
| node := NodeInfo{ | ||
| Name: "node1", | ||
| UnneededSince: now.Add(-10 * time.Minute), | ||
| Threshold: 5 * time.Minute, | ||
| } | ||
| tracker.UpdateStateWithUnneededList([]NodeInfo{node}, now) | ||
|
|
||
| tracker.ObserveDeletion("node1", now) | ||
|
|
||
| tracker.Lock() | ||
| defer tracker.Unlock() | ||
| if _, ok := tracker.nodes["node1"]; ok { | ||
| t.Errorf("expected node1 removed after ObserveDeletion") | ||
| } | ||
| } | ||
|
|
||
| func TestObserveDeletion_NoOpIfNodeNotTracked(t *testing.T) { | ||
| tracker := NewNodeLatencyTracker() | ||
| now := time.Now() | ||
|
|
||
| tracker.ObserveDeletion("node1", now) | ||
|
|
||
| tracker.Lock() | ||
| defer tracker.Unlock() | ||
| if len(tracker.nodes) != 0 { | ||
| t.Errorf("expected no nodes tracked, got %d", len(tracker.nodes)) | ||
| } | ||
| } | ||
|
|
||
| func TestConcurrentUpdatesAndDeletions(t *testing.T) { | ||
| tracker := NewNodeLatencyTracker() | ||
| now := time.Now() | ||
|
|
||
| node := NodeInfo{ | ||
| Name: "node1", | ||
| UnneededSince: now, | ||
| Threshold: 2 * time.Minute, | ||
| } | ||
|
|
||
| var wg sync.WaitGroup | ||
| stop := make(chan struct{}) | ||
|
|
||
| wg.Add(1) | ||
| go func() { | ||
| defer wg.Done() | ||
| for { | ||
| select { | ||
| case <-stop: | ||
| return | ||
| default: | ||
| tracker.UpdateStateWithUnneededList([]NodeInfo{node}, time.Now()) | ||
| } | ||
| } | ||
| }() | ||
|
|
||
| wg.Add(1) | ||
| go func() { | ||
| defer wg.Done() | ||
| for { | ||
| select { | ||
| case <-stop: | ||
| return | ||
| default: | ||
| tracker.ObserveDeletion("node1", time.Now()) | ||
| } | ||
| } | ||
| }() | ||
|
|
||
| time.Sleep(50 * time.Millisecond) | ||
| close(stop) | ||
| wg.Wait() | ||
|
|
||
| tracker.Lock() | ||
| defer tracker.Unlock() | ||
| if len(tracker.nodes) > 1 { | ||
| t.Errorf("expected at most 1 tracked node, got %d", len(tracker.nodes)) | ||
| } | ||
| } |
|
There was a problem hiding this comment. File name not aligned with convention - using underscore between words. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| package latencytracker | ||
|
|
||
| import ( | ||
| "sync" | ||
| "time" | ||
|
|
||
| "k8s.io/autoscaler/cluster-autoscaler/metrics" | ||
|
|
||
| "k8s.io/klog/v2" | ||
| ) | ||
|
|
||
| type NodeInfo struct { | ||
| Name string | ||
|
There was a problem hiding this comment. Looks like we have duplicated information. Name is already in key. |
||
| UnneededSince time.Time | ||
| Threshold time.Duration | ||
| } | ||
|
|
||
| type NodeLatencyTracker struct { | ||
| sync.Mutex | ||
| nodes map[string]NodeInfo | ||
| } | ||
|
|
||
| // NewNodeLatencyTracker creates a new tracker. | ||
| func NewNodeLatencyTracker() *NodeLatencyTracker { | ||
| return &NodeLatencyTracker{ | ||
| nodes: make(map[string]NodeInfo), | ||
| } | ||
| } | ||
|
|
||
| func (t *NodeLatencyTracker) UpdateStateWithUnneededList(list []NodeInfo, timestamp time.Time) { | ||
| t.Lock() | ||
| defer t.Unlock() | ||
|
|
||
| currentSet := make(map[string]struct{}, len(list)) | ||
| for _, info := range list { | ||
| currentSet[info.Name] = struct{}{} | ||
| _, exists := t.nodes[info.Name] | ||
| if !exists { | ||
| t.nodes[info.Name] = NodeInfo{ | ||
| Name: info.Name, | ||
| UnneededSince: info.UnneededSince, | ||
| Threshold: info.Threshold, | ||
| } | ||
| klog.V(2).Infof("Started tracking unneeded node %s at %v with ScaleDownUnneededTime=%v", | ||
| info.Name, info.UnneededSince, info.Threshold) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // ObserveDeletion is called by the actuator just before node deletion. | ||
| func (t *NodeLatencyTracker) ObserveDeletion(nodeName string, timestamp time.Time) { | ||
| t.Lock() | ||
| defer t.Unlock() | ||
|
|
||
| if info, exists := t.nodes[nodeName]; exists { | ||
| duration := timestamp.Sub(info.UnneededSince) | ||
|
|
||
| klog.V(2).Infof( | ||
| "Observing deletion for node %s, unneeded for %s (threshold was %s).", | ||
| nodeName, duration, info.Threshold, | ||
| ) | ||
|
|
||
| metrics.UpdateScaleDownNodeDeletionDuration("true", duration-info.Threshold) | ||
|
Comment on lines
+58
to
+63
There was a problem hiding this comment. Logging and updating metric don't need and shouldn’t be done under lock. |
||
| delete(t.nodes, nodeName) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Name of the flag is unclear. We are missing information that it is latency of removal.