Thanks to visit codestin.com
Credit goes to github.com

Skip to content

oci: specify --systemd-cgroup for all runtime commands #6153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 3 commits into from
Aug 26, 2022
Merged

oci: specify --systemd-cgroup for all runtime commands #6153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08ce6ed
oci: take ExecCmd
haircommander Aug 18, 2022
f09c1d3
oci: refactor runtime command handling
haircommander Aug 18, 2022
7076f72
oci: add --systemd-cgroup to all runtime commands
haircommander Aug 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 44 additions & 25 deletions internal/oci/runtime_oci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"os/exec"
"path/filepath"
"strconv"
"strings"
"syscall"
"time"

Expand Down Expand Up @@ -275,9 +276,7 @@ func (r *runtimeOCI) StartContainer(ctx context.Context, c *Container) error {
return nil
}

if _, err := utils.ExecCmd(
r.handler.RuntimePath, rootFlag, r.root, "start", c.ID(),
); err != nil {
if _, err := r.runtimeCmd("start", c.ID()); err != nil {
return err
}
c.state.Started = time.Now()
Expand Down Expand Up @@ -359,8 +358,8 @@ func (r *runtimeOCI) ExecContainer(ctx context.Context, c *Container, cmd []stri
}
defer os.RemoveAll(processFile)

args := []string{rootFlag, r.root, "exec"}
args = append(args, "--process", processFile, c.ID())
args := r.defaultRuntimeArgs()
args = append(args, "exec", "--process", processFile, c.ID())
execCmd := cmdrunner.Command(r.handler.RuntimePath, args...) // nolint: gosec
if v, found := os.LookupEnv("XDG_RUNTIME_DIR"); found {
execCmd.Env = append(execCmd.Env, fmt.Sprintf("XDG_RUNTIME_DIR=%s", v))
Expand Down Expand Up @@ -494,6 +493,9 @@ func (r *runtimeOCI) ExecSyncContainer(ctx context.Context, c *Container, comman
if timeout > 0 {
args = append(args, "-T", fmt.Sprintf("%d", timeout))
}
if r.config.CgroupManager().IsSystemd() {
args = append(args, "-s")
}

processFile, err := prepareProcessExec(c, command, c.terminal)
if err != nil {
Expand Down Expand Up @@ -839,9 +841,7 @@ func (r *runtimeOCI) StopContainer(ctx context.Context, c *Container, timeout in
}

if timeout > 0 {
if _, err := utils.ExecCmd(
r.handler.RuntimePath, rootFlag, r.root, "kill", c.ID(), c.GetStopSignal(),
); err != nil {
if _, err := r.runtimeCmd("kill", c.ID(), c.GetStopSignal()); err != nil {
checkProcessGone(c)
}
err := WaitContainerStop(ctx, c, time.Duration(timeout)*time.Second, true)
Expand All @@ -851,9 +851,7 @@ func (r *runtimeOCI) StopContainer(ctx context.Context, c *Container, timeout in
log.Warnf(ctx, "Stopping container %v with stop signal timed out: %v", c.ID(), err)
}

if _, err := utils.ExecCmd(
r.handler.RuntimePath, rootFlag, r.root, "kill", c.ID(), "KILL",
); err != nil {
if _, err := r.runtimeCmd("kill", c.ID(), "KILL"); err != nil {
checkProcessGone(c)
}

Expand All @@ -877,7 +875,7 @@ func (r *runtimeOCI) DeleteContainer(ctx context.Context, c *Container) error {
return nil
}

_, err := utils.ExecCmd(r.handler.RuntimePath, rootFlag, r.root, "delete", "--force", c.ID())
_, err := r.runtimeCmd("delete", "--force", c.ID())
return err
}

Expand Down Expand Up @@ -918,11 +916,7 @@ func (r *runtimeOCI) UpdateContainerStatus(ctx context.Context, c *Container) er
}

stateCmd := func() (*ContainerState, bool, error) {
cmd := cmdrunner.Command(r.handler.RuntimePath, rootFlag, r.root, "state", c.ID()) // nolint: gosec
if v, found := os.LookupEnv("XDG_RUNTIME_DIR"); found {
cmd.Env = append(cmd.Env, fmt.Sprintf("XDG_RUNTIME_DIR=%s", v))
}
out, err := cmd.Output()
out, err := r.runtimeCmd("state", c.ID())
if err != nil {
// there are many code paths that could lead to have a bad state in the
// underlying runtime.
Expand All @@ -943,7 +937,7 @@ func (r *runtimeOCI) UpdateContainerStatus(ctx context.Context, c *Container) er
return nil, true, nil
}
state := *c.state
if err := json.NewDecoder(bytes.NewBuffer(out)).Decode(&state); err != nil {
if err := json.NewDecoder(strings.NewReader(out)).Decode(&state); err != nil {
return &state, false, fmt.Errorf("failed to decode container status for %s: %s", c.ID(), err)
}
return &state, false, nil
Expand Down Expand Up @@ -1024,7 +1018,7 @@ func (r *runtimeOCI) PauseContainer(ctx context.Context, c *Container) error {
return nil
}

_, err := utils.ExecCmd(r.handler.RuntimePath, rootFlag, r.root, "pause", c.ID())
_, err := r.runtimeCmd("pause", c.ID())
return err
}

Expand All @@ -1037,7 +1031,7 @@ func (r *runtimeOCI) UnpauseContainer(ctx context.Context, c *Container) error {
return nil
}

_, err := utils.ExecCmd(r.handler.RuntimePath, rootFlag, r.root, "resume", c.ID())
_, err := r.runtimeCmd("resume", c.ID())
return err
}

Expand Down Expand Up @@ -1066,17 +1060,13 @@ func (r *runtimeOCI) SignalContainer(ctx context.Context, c *Container, sig sysc

func (r *runtimeOCI) signalContainer(c *Container, sig syscall.Signal, all bool) error {
args := []string{
rootFlag,
r.root,
"kill",
}
if all {
args = append(args, "-a")
}
args = append(args, c.ID(), strconv.Itoa(int(sig)))
_, err := utils.ExecCmd(
r.handler.RuntimePath, args...,
)
_, err := r.runtimeCmd(args...)
return err
}

Expand Down Expand Up @@ -1357,3 +1347,32 @@ func prepareProcessExec(c *Container, cmd []string, tty bool) (processFile strin
func (c *Container) conmonPidFilePath() string {
return filepath.Join(c.bundlePath, "conmon-pidfile")
}

// runtimeCmd executes a command with args and returns its output as a string along
// with an error, if any
func (r *runtimeOCI) runtimeCmd(args ...string) (string, error) {
runtimeArgs := append(r.defaultRuntimeArgs(), args...)
cmd := cmdrunner.Command(r.handler.RuntimePath, runtimeArgs...)
var stdout bytes.Buffer
var stderr bytes.Buffer
cmd.Stdout = &stdout
cmd.Stderr = &stderr
if v, found := os.LookupEnv("XDG_RUNTIME_DIR"); found {
cmd.Env = append(cmd.Env, fmt.Sprintf("XDG_RUNTIME_DIR=%s", v))
}

err := cmd.Run()
if err != nil {
return "", fmt.Errorf("`%v %v` failed: %v %v: %w", r.handler.RuntimePath, strings.Join(runtimeArgs, " "), stderr.String(), stdout.String(), err)
}

return stdout.String(), nil
}

func (r *runtimeOCI) defaultRuntimeArgs() []string {
args := []string{rootFlag, r.root}
if r.config.CgroupManager().IsSystemd() {
args = append(args, "--systemd-cgroup")
}
return args
}
23 changes: 0 additions & 23 deletions utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package utils

import (
"bytes"
"crypto/rand"
"encoding/hex"
"errors"
Expand All @@ -11,12 +10,10 @@ import (
"path/filepath"
"runtime"
"strconv"
"strings"
"time"

"github.com/containers/podman/v4/pkg/lookup"
"github.com/cri-o/cri-o/internal/dbusmgr"
"github.com/cri-o/cri-o/utils/cmdrunner"
securejoin "github.com/cyphar/filepath-securejoin"
"github.com/opencontainers/runc/libcontainer/user"
"github.com/sirupsen/logrus"
Expand All @@ -28,26 +25,6 @@ import (
"github.com/godbus/dbus/v5"
)

// ExecCmd executes a command with args and returns its output as a string along
// with an error, if any
func ExecCmd(name string, args ...string) (string, error) {
cmd := cmdrunner.Command(name, args...)
var stdout bytes.Buffer
var stderr bytes.Buffer
cmd.Stdout = &stdout
cmd.Stderr = &stderr
if v, found := os.LookupEnv("XDG_RUNTIME_DIR"); found {
cmd.Env = append(cmd.Env, fmt.Sprintf("XDG_RUNTIME_DIR=%s", v))
}

err := cmd.Run()
if err != nil {
return "", fmt.Errorf("`%v %v` failed: %v %v: %w", name, strings.Join(args, " "), stderr.String(), stdout.String(), err)
}

return stdout.String(), nil
}

// StatusToExitCode converts wait status code to an exit code
func StatusToExitCode(status int) int {
return ((status) & 0xff00) >> 8
Expand Down
22 changes: 0 additions & 22 deletions utils/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,6 @@ func (m *errorReaderWriter) Read(p []byte) (int, error) {

// The actual test suite
var _ = t.Describe("Utils", func() {
t.Describe("ExecCmd", func() {
It("should succeed", func() {
// Given
// When
res, err := utils.ExecCmd("ls")

// Then
Expect(err).To(BeNil())
Expect(res).NotTo(BeEmpty())
})

It("should fail on wrong command", func() {
// Given
// When
res, err := utils.ExecCmd("not-existing")

// Then
Expect(err).NotTo(BeNil())
Expect(res).To(BeEmpty())
})
})

t.Describe("StatusToExitCode", func() {
It("should succeed", func() {
// Given
Expand Down