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

Merge pull request #1255 from runcom/panics-grpc-getters 

server: use grpc getters to avoid panics
This commit is contained in:
Mrunal Patel 2018-01-23 07:43:08 -08:00 committed by GitHub
parent ddb14b7303 8c190a683c
commit ed40d645cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/container_create.go
View File

@ -669,7 +669,11 @@ func (s *Server) CreateContainer(ctx context.Context, req *pb.CreateContainerReq
return nil, fmt.Errorf("CreateContainerRequest.ContainerConfig is nil") return nil, fmt.Errorf("CreateContainerRequest.ContainerConfig is nil")
} }
name := containerConfig.GetMetadata().Name if containerConfig.GetMetadata() == nil {
return nil, fmt.Errorf("CreateContainerRequest.ContainerConfig.Metadata is nil")
}
name := containerConfig.GetMetadata().GetName()
if name == "" { if name == "" {
return nil, fmt.Errorf("CreateContainerRequest.ContainerConfig.Name is empty") return nil, fmt.Errorf("CreateContainerRequest.ContainerConfig.Name is empty")
} }

14
server/sandbox_run.go
View File

@ -101,16 +101,20 @@ func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
s.updateLock.RLock() s.updateLock.RLock()
defer s.updateLock.RUnlock() defer s.updateLock.RUnlock()
if req.GetConfig().GetMetadata() == nil {
return nil, fmt.Errorf("CreateContainerRequest.ContainerConfig.Metadata is nil")
}
logrus.Debugf("RunPodSandboxRequest %+v", req) logrus.Debugf("RunPodSandboxRequest %+v", req)
var processLabel, mountLabel, resolvPath string var processLabel, mountLabel, resolvPath string
// process req.Name // process req.Name
kubeName := req.GetConfig().GetMetadata().Name kubeName := req.GetConfig().GetMetadata().GetName()
if kubeName == "" { if kubeName == "" {
return nil, fmt.Errorf("PodSandboxConfig.Name should not be empty") return nil, fmt.Errorf("PodSandboxConfig.Name should not be empty")
} }
namespace := req.GetConfig().GetMetadata().Namespace namespace := req.GetConfig().GetMetadata().GetNamespace()
attempt := req.GetConfig().GetMetadata().Attempt attempt := req.GetConfig().GetMetadata().GetAttempt()
id, name, err := s.generatePodIDandName(req.GetConfig()) id, name, err := s.generatePodIDandName(req.GetConfig())
if err != nil { if err != nil {
@ -156,8 +160,8 @@ func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
name, id, name, id,
s.config.PauseImage, "", s.config.PauseImage, "",
containerName, containerName,
req.GetConfig().GetMetadata().Name, req.GetConfig().GetMetadata().GetName(),
req.GetConfig().GetMetadata().Uid, req.GetConfig().GetMetadata().GetUid(),
namespace, namespace,
attempt, attempt,
nil) nil)