Skip to content

Commit 2818650

Browse files
committed
Move ObserveDeletion to a correct place and test
1 parent 9811884 commit 2818650

File tree

2 files changed

+1659
-1614
lines changed

2 files changed

+1659
-1614
lines changed

cluster-autoscaler/core/scaledown/actuation/actuator.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,9 +327,6 @@ func (a *Actuator) deleteNodesAsync(nodes []*apiv1.Node, nodeGroup cloudprovider
327327
}
328328

329329
for _, node := range nodes {
330-
if a.nodeLatencyTracker != nil {
331-
a.nodeLatencyTracker.ObserveDeletion(node.Name, time.Now())
332-
}
333330
nodeInfo, err := clusterSnapshot.GetNodeInfo(node.Name)
334331
if err != nil {
335332
nodeDeleteResult := status.NodeDeleteResult{ResultType: status.NodeDeleteErrorInternal, Err: errors.NewAutoscalerErrorf(errors.InternalError, "nodeInfos.Get for %q returned error: %v", node.Name, err)}
@@ -352,10 +349,16 @@ func (a *Actuator) deleteNodesAsync(nodes []*apiv1.Node, nodeGroup cloudprovider
352349

353350
if force {
354351
go a.nodeDeletionScheduler.scheduleForceDeletion(nodeInfo, nodeGroup, batchSize, drain)
352+
if a.nodeLatencyTracker != nil {
353+
a.nodeLatencyTracker.ObserveDeletion(node.Name, time.Now())
354+
}
355355
continue
356356
}
357357

358358
go a.nodeDeletionScheduler.ScheduleDeletion(nodeInfo, nodeGroup, batchSize, drain)
359+
if a.nodeLatencyTracker != nil {
360+
a.nodeLatencyTracker.ObserveDeletion(node.Name, time.Now())
361+
}
359362
}
360363
}
361364

0 commit comments

Comments
 (0)