vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge 8073427f76 into cf4e5ee903

Browse source
This commit is contained in:
Harry Zhang 2017-05-28 12:51:34 +00:00 • committed by GitHub
commit a864947b19
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/container_create.go
View file

@ -490,6 +490,10 @@ func (s *Server) createSandboxContainer(ctx context.Context, containerID string,
// Join the namespace paths for the pod sandbox container. // Join the namespace paths for the pod sandbox container.
podInfraState := s.runtime.ContainerStatus(sb.infraContainer) podInfraState := s.runtime.ContainerStatus(sb.infraContainer)
if podInfraState == nil {
return nil, fmt.Errorf("state of infra container of given sandbox: %q is nil, which is unexpected", sb.metadata.GetName())
}
logrus.Debugf("pod container state %+v", podInfraState) logrus.Debugf("pod container state %+v", podInfraState)
ipcNsPath := fmt.Sprintf("/proc/%d/ns/ipc", podInfraState.Pid) ipcNsPath := fmt.Sprintf("/proc/%d/ns/ipc", podInfraState.Pid)