Merge pull request #63220 from dashpole/fix_memcg_format

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix formatting for kubelet memcg notification threshold /kind bug **What this PR does / why we need it**: This fixes the following errors (found in [this node_e2e serial test log](https://storage.googleapis.com/kubernetes-jenkins/logs/ci-kubernetes-node-kubelet-serial/4118/artifacts/tmp-node-e2e-49baaf8a-cos-stable-63-10032-71-0/kubelet.log)): `eviction_manager.go:256] eviction manager attempting to integrate with kernel memcg notification api` `threshold_notifier_linux.go:70] eviction: setting notification threshold to 4828488Ki` `eviction_manager.go:272] eviction manager: failed to create hard memory threshold notifier: invalid argument` **Special notes for your reviewer**: This needs to be cherrypicked back to 1.10. This regression was added in https://github.com/kubernetes/kubernetes/pull/60531, because the `quantity` being used was changed from a DecimalSI to BinarySI, which changes how it is printed out in the String() method. To make it more explicit that we want the value, just convert Value() to a string. **Release note**: ```release-note Fix memory cgroup notifications, and reduce associated log spam. ```

Merge pull request #63220 from dashpole/fix_memcg_format
c7bfc2a1 · Kubernetes Submit Queue · GitHub · 7d9725e9 · b294173f · c7bfc2a1
Unverified Commit c7bfc2a1 authored May 16, 2018 by Kubernetes Submit Queue Committed by GitHub May 16, 2018
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

eviction_manager.go pkg/kubelet/eviction/eviction_manager.go +2 -1

No files found.
--- a/pkg/kubelet/eviction/eviction_manager.go
+++ b/pkg/kubelet/eviction/eviction_manager.go
@@ -19,6 +19,7 @@ package eviction
 import (
 	"fmt"
 	"sort"
+	"strconv"
 	"sync"
 	"time"
@@ -231,7 +232,7 @@ func (m *managerImpl) startMemoryThresholdNotifier(summary *statsapi.Summary, ha
 		memcgThreshold.Sub(*evictionThresholdQuantity)
 		memcgThreshold.Add(*inactiveFile)
 		description := fmt.Sprintf("<%s available", formatThresholdValue(threshold.Value))
-		memcgThresholdNotifier, err := NewMemCGThresholdNotifier(cgpath, attribute, memcgThreshold.String(), description, handler)
+		memcgThresholdNotifier, err := NewMemCGThresholdNotifier(cgpath, attribute, strconv.FormatInt(memcgThreshold.Value(), 10), description, handler)
 		if err != nil {
 			return err
 		}