From 783ae166406d72f1ed4983b281183f0e165a7482 Mon Sep 17 00:00:00 2001 From: Lijing Date: Wed, 20 Jan 2021 12:54:10 +0800 Subject: [PATCH 1/2] Fill in the LastUpdateTime Field of VpaCheckpoint Status with Correct Time. --- .../pkg/recommender/model/aggregate_container_state.go | 1 + .../pkg/recommender/model/aggregate_container_state_test.go | 2 ++ 2 files changed, 3 insertions(+) diff --git a/vertical-pod-autoscaler/pkg/recommender/model/aggregate_container_state.go b/vertical-pod-autoscaler/pkg/recommender/model/aggregate_container_state.go index 93f6abc83638..3facbe37ea90 100644 --- a/vertical-pod-autoscaler/pkg/recommender/model/aggregate_container_state.go +++ b/vertical-pod-autoscaler/pkg/recommender/model/aggregate_container_state.go @@ -233,6 +233,7 @@ func (a *AggregateContainerState) SaveToCheckpoint() (*vpa_types.VerticalPodAuto return nil, err } return &vpa_types.VerticalPodAutoscalerCheckpointStatus{ + LastUpdateTime: metav1.NewTime(time.Now()), FirstSampleStart: metav1.NewTime(a.FirstSampleStart), LastSampleStart: metav1.NewTime(a.LastSampleStart), TotalSamplesCount: a.TotalSamplesCount, diff --git a/vertical-pod-autoscaler/pkg/recommender/model/aggregate_container_state_test.go b/vertical-pod-autoscaler/pkg/recommender/model/aggregate_container_state_test.go index 4324dfcf1ad6..3a38801e4d43 100644 --- a/vertical-pod-autoscaler/pkg/recommender/model/aggregate_container_state_test.go +++ b/vertical-pod-autoscaler/pkg/recommender/model/aggregate_container_state_test.go @@ -141,6 +141,7 @@ func TestAggregateContainerStateSaveToCheckpoint(t *testing.T) { assert.NoError(t, err) + assert.Equal(t, time.Now().Round(1*time.Second), checkpoint.LastUpdateTime.Time.Round(1*time.Second)) assert.Equal(t, t1, checkpoint.FirstSampleStart.Time) assert.Equal(t, t2, checkpoint.LastSampleStart.Time) assert.Equal(t, 10, checkpoint.TotalSamplesCount) @@ -168,6 +169,7 @@ func TestAggregateContainerStateLoadFromCheckpoint(t *testing.T) { checkpoint := vpa_types.VerticalPodAutoscalerCheckpointStatus{ Version: SupportedCheckpointVersion, + LastUpdateTime: metav1.NewTime(time.Now()), FirstSampleStart: metav1.NewTime(t1), LastSampleStart: metav1.NewTime(t2), TotalSamplesCount: 20, From 17b3def2aca710022b8f80d6a70e81b996370622 Mon Sep 17 00:00:00 2001 From: Lijing Date: Fri, 22 Jan 2021 11:01:27 +0800 Subject: [PATCH 2/2] expand testing time window to 10s --- .../pkg/recommender/model/aggregate_container_state_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vertical-pod-autoscaler/pkg/recommender/model/aggregate_container_state_test.go b/vertical-pod-autoscaler/pkg/recommender/model/aggregate_container_state_test.go index 3a38801e4d43..dc6b11548323 100644 --- a/vertical-pod-autoscaler/pkg/recommender/model/aggregate_container_state_test.go +++ b/vertical-pod-autoscaler/pkg/recommender/model/aggregate_container_state_test.go @@ -141,7 +141,7 @@ func TestAggregateContainerStateSaveToCheckpoint(t *testing.T) { assert.NoError(t, err) - assert.Equal(t, time.Now().Round(1*time.Second), checkpoint.LastUpdateTime.Time.Round(1*time.Second)) + assert.True(t, time.Now().Sub(checkpoint.LastUpdateTime.Time) < 10*time.Second) assert.Equal(t, t1, checkpoint.FirstSampleStart.Time) assert.Equal(t, t2, checkpoint.LastSampleStart.Time) assert.Equal(t, 10, checkpoint.TotalSamplesCount)