Merge pull request #902 from luomingmeng/dev/fix-sidecar-memory-state

fix(memory): copy missing annotations in sidecar allocation

Author: luomingmeng

pkg/agent/qrm-plugins/cpu/dynamicpolicy/cpueviction/strategy/pressure_suppression.go

@@ -236,11 +236,17 @@ func (p *CPUPressureSuppression) evictPodsByReclaimMetrics(now time.Time, filter
 
 			// a pod will only be evicted if its cpu suppression lasts longer than minToleranceDuration
 			if lastDuration > evictionConfiguration.MinSuppressionToleranceDuration {
-				evictPods = append(evictPods, &v1alpha1.EvictPod{
+				evictPod := &v1alpha1.EvictPod{
 					Pod: pod,
 					Reason: fmt.Sprintf("current pool suppression rate %.2f is over than the "+
 						"pod suppression tolerance rate %.2f", poolSuppressionRate, podToleranceRate),
-				})
+				}
+				if evictionConfiguration.GracePeriod > 0 {
+					evictPod.DeletionOptions = &v1alpha1.DeletionOptions{
+						GracePeriodSeconds: evictionConfiguration.GracePeriod,
+					}
+				}
+				evictPods = append(evictPods, evictPod)
 				totalCPURequest.Sub(native.CPUQuantityGetter()(native.SumUpPodRequestResources(pod)))
 			}
 		} else {

pkg/agent/qrm-plugins/memory/dynamicpolicy/util.go

@@ -97,9 +97,19 @@ func getReservedMemory(conf *config.Configuration, metaServer *metaserver.MetaSe
 }
 
 func applySidecarAllocationInfoFromMainContainer(sidecarAllocationInfo, mainAllocationInfo *state.AllocationInfo) bool {
+	changed := false
 	if !sidecarAllocationInfo.NumaAllocationResult.Equals(mainAllocationInfo.NumaAllocationResult) {
 		sidecarAllocationInfo.NumaAllocationResult = mainAllocationInfo.NumaAllocationResult.Clone()
-		return true
+		changed = true
 	}
-	return false
+
+	// Copy missing annotations from main container
+	for key, value := range mainAllocationInfo.Annotations {
+		if _, ok := sidecarAllocationInfo.Annotations[key]; !ok {
+			sidecarAllocationInfo.Annotations[key] = value
+			changed = true
+		}
+	}
+
+	return changed
 }