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

oci: Use container ID as ID instead of container name

Browse source 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
This commit is contained in:
Mrunal Patel 2017-06-23 15:01:05 -07:00
parent 033f6885c1
commit 67504a02d5
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
oci/oci.go
View file

@ -140,7 +140,7 @@ func (r *Runtime) CreateContainer(c *Container, cgroupParent string) error {
if r.cgroupManager == "systemd" { if r.cgroupManager == "systemd" {
args = append(args, "-s") args = append(args, "-s")
} }
args = append(args, "-c", c.name) args = append(args, "-c", c.id)
args = append(args, "-u", c.id) args = append(args, "-u", c.id)
args = append(args, "-r", r.Path(c)) args = append(args, "-r", r.Path(c))
args = append(args, "-b", c.bundlePath) args = append(args, "-b", c.bundlePath)
@ -184,8 +184,8 @@ func (r *Runtime) CreateContainer(c *Container, cgroupParent string) error {
// Move conmon to specified cgroup // Move conmon to specified cgroup
if cgroupParent != "" { if cgroupParent != "" {
if r.cgroupManager == "systemd" { if r.cgroupManager == "systemd" {
logrus.Infof("Running conmon under slice %s and unitName %s", cgroupParent, createUnitName("crio", c.name)) logrus.Infof("Running conmon under slice %s and unitName %s", cgroupParent, createUnitName("crio-conmon", c.id))
if err = utils.RunUnderSystemdScope(cmd.Process.Pid, cgroupParent, createUnitName("crio", c.name)); err != nil { if err = utils.RunUnderSystemdScope(cmd.Process.Pid, cgroupParent, createUnitName("crio-conmon", c.id)); err != nil {
logrus.Warnf("Failed to add conmon to sandbox cgroup: %v", err) logrus.Warnf("Failed to add conmon to sandbox cgroup: %v", err)
} }
} }
@ -247,7 +247,7 @@ func createUnitName(prefix string, name string) string {
func (r *Runtime) StartContainer(c *Container) error { func (r *Runtime) StartContainer(c *Container) error {
c.opLock.Lock() c.opLock.Lock()
defer c.opLock.Unlock() defer c.opLock.Unlock()
if err := utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.Path(c), "start", c.name); err != nil { if err := utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.Path(c), "start", c.id); err != nil {
return err return err
} }
c.state.Started = time.Now() c.state.Started = time.Now()
@ -341,7 +341,7 @@ func (r *Runtime) ExecSync(c *Container, command []string, timeout int64) (resp
} }
}() }()
logFile, err := ioutil.TempFile("", "crio-log-"+c.name) logFile, err := ioutil.TempFile("", "crio-log-"+c.id)
if err != nil { if err != nil {
return nil, ExecSyncError{ return nil, ExecSyncError{
ExitCode: -1, ExitCode: -1,
@ -364,7 +364,7 @@ func (r *Runtime) ExecSync(c *Container, command []string, timeout int64) (resp
defer os.RemoveAll(f.Name()) defer os.RemoveAll(f.Name())
var args []string var args []string
args = append(args, "-c", c.name) args = append(args, "-c", c.id)
args = append(args, "-r", r.Path(c)) args = append(args, "-r", r.Path(c))
args = append(args, "-p", pidFile.Name()) args = append(args, "-p", pidFile.Name())
args = append(args, "-e") args = append(args, "-e")
@ -493,7 +493,7 @@ func (r *Runtime) ExecSync(c *Container, command []string, timeout int64) (resp
func (r *Runtime) StopContainer(c *Container, timeout int64) error { func (r *Runtime) StopContainer(c *Container, timeout int64) error {
c.opLock.Lock() c.opLock.Lock()
defer c.opLock.Unlock() defer c.opLock.Unlock()
if err := utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.Path(c), "kill", c.name, c.GetStopSignal()); err != nil { if err := utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.Path(c), "kill", c.id, c.GetStopSignal()); err != nil {
return err return err
} }
if timeout == -1 { if timeout == -1 {
@ -544,7 +544,7 @@ func (r *Runtime) StopContainer(c *Container, timeout int64) error {
func (r *Runtime) DeleteContainer(c *Container) error { func (r *Runtime) DeleteContainer(c *Container) error {
c.opLock.Lock() c.opLock.Lock()
defer c.opLock.Unlock() defer c.opLock.Unlock()
_, err := utils.ExecCmd(r.Path(c), "delete", "--force", c.name) _, err := utils.ExecCmd(r.Path(c), "delete", "--force", c.id)
return err return err
} }
@ -561,7 +561,7 @@ func (r *Runtime) SetStartFailed(c *Container, err error) {
func (r *Runtime) UpdateStatus(c *Container) error { func (r *Runtime) UpdateStatus(c *Container) error {
c.opLock.Lock() c.opLock.Lock()
defer c.opLock.Unlock() defer c.opLock.Unlock()
out, err := exec.Command(r.Path(c), "state", c.name).CombinedOutput() out, err := exec.Command(r.Path(c), "state", c.id).CombinedOutput()
if err != nil { if err != nil {
// there are many code paths that could lead to have a bad state in the // there are many code paths that could lead to have a bad state in the
// underlying runtime. // underlying runtime.
@ -575,7 +575,7 @@ func (r *Runtime) UpdateStatus(c *Container) error {
return nil return nil
} }
if err := json.NewDecoder(bytes.NewBuffer(out)).Decode(&c.state); err != nil { if err := json.NewDecoder(bytes.NewBuffer(out)).Decode(&c.state); err != nil {
return fmt.Errorf("failed to decode container status for %s: %s", c.name, err) return fmt.Errorf("failed to decode container status for %s: %s", c.id, err)
} }
if c.state.Status == ContainerStateStopped { if c.state.Status == ContainerStateStopped {

2
server/container_exec.go
View file

@ -49,7 +49,7 @@ func (ss streamService) Exec(containerID string, cmd []string, stdin io.Reader,
if tty { if tty {
args = append(args, "-t") args = append(args, "-t")
} }
args = append(args, c.Name()) args = append(args, c.ID())
args = append(args, cmd...) args = append(args, cmd...)
execCmd := exec.Command(ss.runtimeServer.runtime.Path(c), args...) execCmd := exec.Command(ss.runtimeServer.runtime.Path(c), args...)
var cmdErr error var cmdErr error