sandbox: fix sandbox logPath when crio restarts
We weren't setting the logPath of the sandbox when restoring sandboxes and containers upon a crio restarts. That means that if you restart CRI-O you get sandboxes with empty logPath. That means that when you're starting a container in a restored sandbox you get a relative logPath for the container: sandboxLogPath: "/var/something" - restore sandboxLogPath: "" - create container foo containerLogPath: "foo_attempt.log" With this patch we actually get an absolute path (which is correct): sandboxLogPath: "/var/something" - restore sandboxLogPath: "/var/something" - create container foo containerLogPath: "/var/something/foo_attempt.log" Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
parent
28997fe4cd
commit
a0157078ad
4 changed files with 21 additions and 9 deletions
|
@ -335,7 +335,7 @@ func (c *ContainerServer) LoadSandbox(id string) error {
|
|||
privileged := isTrue(m.Annotations[annotations.PrivilegedRuntime])
|
||||
trusted := isTrue(m.Annotations[annotations.TrustedSandbox])
|
||||
|
||||
sb, err := sandbox.New(id, name, m.Annotations[annotations.KubeName], filepath.Dir(m.Annotations[annotations.LogPath]), "", labels, kubeAnnotations, processLabel, mountLabel, &metadata, m.Annotations[annotations.ShmPath], "", privileged, trusted, m.Annotations[annotations.ResolvPath], "", nil)
|
||||
sb, err := sandbox.New(id, m.Annotations[annotations.Namespace], name, m.Annotations[annotations.KubeName], filepath.Dir(m.Annotations[annotations.LogPath]), labels, kubeAnnotations, processLabel, mountLabel, &metadata, m.Annotations[annotations.ShmPath], m.Annotations[annotations.CgroupParent], privileged, trusted, m.Annotations[annotations.ResolvPath], m.Annotations[annotations.HostName], nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue