New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use OomScoreAdj in kubelet for newer docker api #21741
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
/* | ||
Copyright 2016 The Kubernetes Authors All rights reserved. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package cache | ||
|
||
import ( | ||
"fmt" | ||
"sync" | ||
"time" | ||
|
||
"github.com/golang/glog" | ||
|
||
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" | ||
"k8s.io/kubernetes/pkg/util/wait" | ||
) | ||
|
||
type VersionCache struct { | ||
lock sync.RWMutex | ||
cache map[string]versionInfo | ||
updater func() (kubecontainer.Version, kubecontainer.Version, error) | ||
} | ||
|
||
// versionInfo caches api version and daemon version. | ||
type versionInfo struct { | ||
apiVersion kubecontainer.Version | ||
version kubecontainer.Version | ||
} | ||
|
||
const maxVersionCacheEntries = 1000 | ||
|
||
func NewVersionCache(f func() (kubecontainer.Version, kubecontainer.Version, error)) *VersionCache { | ||
return &VersionCache{ | ||
cache: map[string]versionInfo{}, | ||
updater: f, | ||
} | ||
} | ||
|
||
// Update updates cached versionInfo by using a unique string (e.g. machineInfo) as the key. | ||
func (c *VersionCache) Update(key string) { | ||
apiVersion, daemonVersion, err := c.updater() | ||
|
||
if err != nil { | ||
glog.Errorf("Fail to get version info from container runtime: %v", err) | ||
} else { | ||
c.lock.Lock() | ||
defer c.lock.Unlock() | ||
c.cache[key] = versionInfo{apiVersion, daemonVersion} | ||
} | ||
} | ||
|
||
// Get gets cached versionInfo by using a unique string (e.g. machineInfo) as the key. | ||
// It returns apiVersion first and followed by daemon version. | ||
func (c *VersionCache) Get(key string) (kubecontainer.Version, kubecontainer.Version, error) { | ||
c.lock.RLock() | ||
defer c.lock.RUnlock() | ||
value, ok := c.cache[key] | ||
if !ok { | ||
return nil, nil, fmt.Errorf("Failed to get version info from cache by key: ", key) | ||
} | ||
return value.apiVersion, value.version, nil | ||
} | ||
|
||
func (c *VersionCache) UpdateCachePeriodly(key string) { | ||
go wait.Until(func() { | ||
c.Update(key) | ||
}, 1*time.Minute, wait.NeverStop) | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@resouer Thanks for the cleanup! :)