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
|
@ -255,7 +255,7 @@ func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
|
|||
}
|
||||
|
||||
// set log directory
|
||||
logDir := req.GetConfig().LogDirectory
|
||||
logDir := req.GetConfig().GetLogDirectory()
|
||||
if logDir == "" {
|
||||
logDir = filepath.Join(s.config.LogDir, id)
|
||||
}
|
||||
|
@ -343,6 +343,7 @@ func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
|
|||
g.AddAnnotation(annotations.Annotations, string(kubeAnnotationsJSON))
|
||||
g.AddAnnotation(annotations.LogPath, logPath)
|
||||
g.AddAnnotation(annotations.Name, name)
|
||||
g.AddAnnotation(annotations.Namespace, namespace)
|
||||
g.AddAnnotation(annotations.ContainerType, annotations.ContainerTypeSandbox)
|
||||
g.AddAnnotation(annotations.SandboxID, id)
|
||||
g.AddAnnotation(annotations.ContainerName, containerName)
|
||||
|
@ -384,6 +385,7 @@ func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
|
|||
g.SetLinuxCgroupsPath(cgPath)
|
||||
}
|
||||
}
|
||||
g.AddAnnotation(annotations.CgroupParent, cgroupParent)
|
||||
|
||||
sb, err := sandbox.New(id, namespace, name, kubeName, logDir, labels, kubeAnnotations, processLabel, mountLabel, metadata, shmPath, cgroupParent, privileged, trusted, resolvPath, hostname, portMappings)
|
||||
if err != nil {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue