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

Merge pull request #717 from 14rcole/oci-getcontainer

Browse source 
Allow oci memory store to match containers by id prefix or by name
This commit is contained in:
Antonio Murdaca 2017-08-02 16:55:36 +02:00 • committed by GitHub
commit da176cd379
7 changed files with 81 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

24
server/container.go
View file

@ -1,24 +0,0 @@
package server
import (
"fmt"
"github.com/kubernetes-incubator/cri-o/oci"
)
func (s *Server) getContainerFromRequest(cid string) (*oci.Container, error) {
if cid == "" {
return nil, fmt.Errorf("container ID should not be empty")
}
containerID, err := s.CtrIDIndex().Get(cid)
if err != nil {
return nil, fmt.Errorf("container with ID starting with %s not found: %v", cid, err)
}
c := s.ContainerServer.GetContainer(containerID)
if c == nil {
return nil, fmt.Errorf("specified container not found: %s", containerID)
}
return c, nil
}

2
server/container_execsync.go
View file

@ -12,7 +12,7 @@ import (
// ExecSync runs a command in a container synchronously.
func (s *Server) ExecSync(ctx context.Context, req *pb.ExecSyncRequest) (*pb.ExecSyncResponse, error) {
logrus.Debugf("ExecSyncRequest %+v", req)
c, err := s.getContainerFromRequest(req.ContainerId)
c, err := s.GetContainerFromRequest(req.ContainerId)
if err != nil {
return nil, err
}

2
server/container_remove.go
View file

@ -13,7 +13,7 @@ import (
// should be force removed.
func (s *Server) RemoveContainer(ctx context.Context, req *pb.RemoveContainerRequest) (*pb.RemoveContainerResponse, error) {
logrus.Debugf("RemoveContainerRequest %+v", req)
c, err := s.getContainerFromRequest(req.ContainerId)
c, err := s.GetContainerFromRequest(req.ContainerId)
if err != nil {
return nil, err
}

2
server/container_start.go
View file

@ -12,7 +12,7 @@ import (
// StartContainer starts the container.
func (s *Server) StartContainer(ctx context.Context, req *pb.StartContainerRequest) (*pb.StartContainerResponse, error) {
logrus.Debugf("StartContainerRequest %+v", req)
c, err := s.getContainerFromRequest(req.ContainerId)
c, err := s.GetContainerFromRequest(req.ContainerId)
if err != nil {
return nil, err
}

2
server/container_status.go
View file

@ -21,7 +21,7 @@ const (
// ContainerStatus returns status of the container.
func (s *Server) ContainerStatus(ctx context.Context, req *pb.ContainerStatusRequest) (*pb.ContainerStatusResponse, error) {
logrus.Debugf("ContainerStatusRequest %+v", req)
c, err := s.getContainerFromRequest(req.ContainerId)
c, err := s.GetContainerFromRequest(req.ContainerId)
if err != nil {
return nil, err
}

2
server/container_stop.go
View file

@ -12,7 +12,7 @@ import (
// StopContainer stops a running container with a grace period (i.e., timeout).
func (s *Server) StopContainer(ctx context.Context, req *pb.StopContainerRequest) (*pb.StopContainerResponse, error) {
logrus.Debugf("StopContainerRequest %+v", req)
c, err := s.getContainerFromRequest(req.ContainerId)
c, err := s.GetContainerFromRequest(req.ContainerId)
if err != nil {
return nil, err
}