This repository has been archived by the owner on Mar 9, 2022. It is now read-only.
Do not error out if uuid is not found. #510
Merged
Conversation
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
Random-Liu
force-pushed
the
do-not-exit
branch
from
dd1c695
to
c9ae3f4
Compare
Random-Liu
force-pushed
the
do-not-exit
branch
from
c9ae3f4
to
04a71ea
Compare
mikebrow
reviewed
Jan 4, 2018
| @@ -96,6 +96,9 @@ type Config struct { | |||
| ProfilingPort string `toml:"profiling_port" json:"profilingPort,omitempty"` | |||
| // ProfilingAddress is address for profiling via host:port/debug/pprof/ | |||
| ProfilingAddress string `toml:"profiling_addr" json:"profilingAddress,omitempty"` | |||
| // SkipImageFSUUID skips retrieving imagefs uuid. | |||
There was a problem hiding this comment.
/s/./ for new instance of CRIContainerdService./
| @@ -158,6 +161,8 @@ func (c *CRIContainerdOptions) AddFlags(fs *pflag.FlagSet) { | |||
| defaults.ProfilingPort, "Profiling port for web interface host:port/debug/pprof/.") | |||
| fs.StringVar(&c.ProfilingAddress, "profiling-addr", | |||
| defaults.ProfilingAddress, "Profiling address for web interface host:port/debug/pprof/.") | |||
| fs.BoolVar(&c.SkipImageFSUUID, "skip-imagefs-uuid", | |||
| defaults.SkipImageFSUUID, "Skip retrieving imagefs uuid. When turned on, kubelet can't get imagefs capacity and imagefs disk eviction can't work.") | |||
There was a problem hiding this comment.
Skip retrieval of imagefs uuid for new CRIContainerdService instances. When turned on, the kubelet will not be able to get imagefs capacity or request imagefs disk eviction.
There was a problem hiding this comment.
CRIContainerdService is code name, I don't think user cares about that in the flag discription. :)
I'll update the other parts.
| c.imageFSUUID, err = c.getDeviceUUID(imageFSPath) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to get imagefs uuid of %q: %v", imageFSPath, err) | ||
| if !c.config.SkipImageFSUUID { |
There was a problem hiding this comment.
suggest adding an info logf that it has been skipped..
Signed-off-by: Lantao Liu <lantaol@google.com>
Random-Liu
force-pushed
the
do-not-exit
branch
from
04a71ea
to
dca0535
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Current uuid handling logic is not perfect. Some known issues have been reported such as #509, #399 and #325.
When this doesn't work, kubelet won't be able to get image filesystem capacity and usage. However, we should not keep user from trying cri-containerd out because of this.
Add a flag to skip this logic, and I'll figure out how we could make this more portable across different environments.
Signed-off-by: Lantao Liu lantaol@google.com