Merge pull request #52046 from dashpole/soft_eviction

Automatic merge from submit-queue (batch tested with PRs 48226, 52046, 52231, 52344, 52352) [BugFix] Soft Eviction timer works correctly fixes #51516 thresholdsMet should not exclude previously met thresholds when we do not have new stats for a threshold. /assign @vishh @derekwaynecarr cc @kubernetes/sig-node-bugs

Merge pull request #52046 from dashpole/soft_eviction
32f1521c · Kubernetes Submit Queue · GitHub · 83b4c0ac · d60d4a44 · 32f1521c
Commit 32f1521c authored Sep 12, 2017 by Kubernetes Submit Queue Committed by GitHub Sep 12, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

eviction_manager.go pkg/kubelet/eviction/eviction_manager.go +5 -4

No files found.
--- a/pkg/kubelet/eviction/eviction_manager.go
+++ b/pkg/kubelet/eviction/eviction_manager.go
@@ -274,10 +274,6 @@ func (m *managerImpl) synchronize(diskInfoProvider DiskInfoProvider, podFunc Act
 	}
 	debugLogThresholdsWithObservation("thresholds - reclaim not satisfied", thresholds, observations)

-	// determine the set of thresholds whose stats have been updated since the last sync
-	thresholds = thresholdsUpdatedStats(thresholds, observations, m.lastObservations)
-	debugLogThresholdsWithObservation("thresholds - updated stats", thresholds, observations)
-
 	// track when a threshold was first observed
 	now := m.clock.Now()
 	thresholdsFirstObservedAt := thresholdsFirstObservedAt(thresholds, m.thresholdsFirstObservedAt, now)
@@ -307,6 +303,11 @@ func (m *managerImpl) synchronize(diskInfoProvider DiskInfoProvider, podFunc Act
 	m.thresholdsFirstObservedAt = thresholdsFirstObservedAt
 	m.nodeConditionsLastObservedAt = nodeConditionsLastObservedAt
 	m.thresholdsMet = thresholds
+
+	// determine the set of thresholds whose stats have been updated since the last sync
+	thresholds = thresholdsUpdatedStats(thresholds, observations, m.lastObservations)
+	debugLogThresholdsWithObservation("thresholds - updated stats", thresholds, observations)
+
 	m.lastObservations = observations
 	m.Unlock()