Skip to content

Commit 296badd

Browse files
committed
removed lock from metrics tracking
1 parent 79126fe commit 296badd

File tree

2 files changed

+0
-18
lines changed

2 files changed

+0
-18
lines changed

cluster-autoscaler/core/scaledown/latencytracker/node_latency_tracker.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package latencytracker
22

33
import (
4-
"sync"
54
"time"
65

76
"k8s.io/autoscaler/cluster-autoscaler/metrics"
@@ -16,7 +15,6 @@ type NodeInfo struct {
1615
}
1716

1817
type NodeLatencyTracker struct {
19-
sync.Mutex
2018
nodes map[string]NodeInfo
2119
}
2220

@@ -28,9 +26,6 @@ func NewNodeLatencyTracker() *NodeLatencyTracker {
2826
}
2927

3028
func (t *NodeLatencyTracker) UpdateStateWithUnneededList(list []NodeInfo, timestamp time.Time) {
31-
t.Lock()
32-
defer t.Unlock()
33-
3429
currentSet := make(map[string]struct{}, len(list))
3530
for _, info := range list {
3631
currentSet[info.Name] = struct{}{}
@@ -49,9 +44,6 @@ func (t *NodeLatencyTracker) UpdateStateWithUnneededList(list []NodeInfo, timest
4944

5045
// ObserveDeletion is called by the actuator just before node deletion.
5146
func (t *NodeLatencyTracker) ObserveDeletion(nodeName string, timestamp time.Time) {
52-
t.Lock()
53-
defer t.Unlock()
54-
5547
if info, exists := t.nodes[nodeName]; exists {
5648
duration := timestamp.Sub(info.UnneededSince)
5749

cluster-autoscaler/core/scaledown/latencytracker/node_latency_tracker_test.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ func TestUpdateStateWithUnneededList_AddsNewNodes(t *testing.T) {
2929

3030
tracker.UpdateStateWithUnneededList([]NodeInfo{node}, now)
3131

32-
tracker.Lock()
33-
defer tracker.Unlock()
3432
if _, ok := tracker.nodes["node1"]; !ok {
3533
t.Errorf("expected node1 to be tracked, but was not")
3634
}
@@ -44,8 +42,6 @@ func TestUpdateStateWithUnneededList_DoesNotDuplicate(t *testing.T) {
4442
tracker.UpdateStateWithUnneededList([]NodeInfo{node}, now)
4543
tracker.UpdateStateWithUnneededList([]NodeInfo{node}, now.Add(time.Minute))
4644

47-
tracker.Lock()
48-
defer tracker.Unlock()
4945
if len(tracker.nodes) != 1 {
5046
t.Errorf("expected 1 tracked node, got %d", len(tracker.nodes))
5147
}
@@ -63,8 +59,6 @@ func TestObserveDeletion_RemovesNode(t *testing.T) {
6359

6460
tracker.ObserveDeletion("node1", now)
6561

66-
tracker.Lock()
67-
defer tracker.Unlock()
6862
if _, ok := tracker.nodes["node1"]; ok {
6963
t.Errorf("expected node1 removed after ObserveDeletion")
7064
}
@@ -76,8 +70,6 @@ func TestObserveDeletion_NoOpIfNodeNotTracked(t *testing.T) {
7670

7771
tracker.ObserveDeletion("node1", now)
7872

79-
tracker.Lock()
80-
defer tracker.Unlock()
8173
if len(tracker.nodes) != 0 {
8274
t.Errorf("expected no nodes tracked, got %d", len(tracker.nodes))
8375
}
@@ -126,8 +118,6 @@ func TestConcurrentUpdatesAndDeletions(t *testing.T) {
126118
close(stop)
127119
wg.Wait()
128120

129-
tracker.Lock()
130-
defer tracker.Unlock()
131121
if len(tracker.nodes) > 1 {
132122
t.Errorf("expected at most 1 tracked node, got %d", len(tracker.nodes))
133123
}

0 commit comments

Comments
 (0)