Files
my-rook-config/pkg/util/exec/exec.go
T
Anas Khan 7630d21e85 core: fix data race reading exec output on timeout
executeCommandWithTimeout wires a single bytes.Buffer to both cmd.Stdout
and cmd.Stderr and joins the command in a goroutine via cmd.Wait(). On
the timeout kill path it called cmd.Process.Kill() and then read that
buffer without waiting for cmd.Wait() to return. Kill() only signals the
process; it does not wait for os/exec's output-copier goroutines (joined
only by cmd.Wait) to finish, so reading the buffer there races with those
writers, which the race detector flags.

Only read the buffer once the copier goroutines have drained, signaled by
cmd.Wait() on the done channel. Because a killed process can leave an
orphaned descendant holding the output pipe open -- a D-state
cryptsetup/dmsetup child, or the downstream of a "sh -c '... | head'"
pipeline -- cmd.Wait() may never return, so bound the drain with a short
grace period and give up on the captured output rather than blocking the
caller forever. This keeps the bounded return the timeout path is meant
to guarantee. On a failed Kill() the process may still be writing, so
return without reading the buffer.

Add a regression test that drives the kill path with a child that ignores
SIGINT while writing to stdout; it fails under -race before this change.

Signed-off-by: Anas Khan <83116240+anxkhn@users.noreply.github.com>
Signed-off-by: Joshua Hoblitt <josh@hoblitt.com>
2026-07-21 09:01:12 -07:00

311 lines
10 KiB
Go

/*
Copyright 2016 The Rook Authors. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package exec
import (
"bufio"
"bytes"
"fmt"
"io"
"os"
"os/exec"
"reflect"
"strconv"
"strings"
"time"
"github.com/coreos/pkg/capnslog"
"github.com/pkg/errors"
kerrors "k8s.io/apimachinery/pkg/api/errors"
kexec "k8s.io/utils/exec"
)
// TimeoutWaitingForMessage can be used to identify if an error is due to a timeout.
const TimeoutWaitingForMessage = "exec timeout waiting for"
var CephCommandsTimeout = 15 * time.Second
// outputDrainGracePeriod bounds how long executeCommandWithTimeout waits for the
// os/exec output-copier goroutines to drain after killing a timed-out process,
// so a killed command that orphaned a pipe holder cannot block the caller forever.
var outputDrainGracePeriod = 500 * time.Millisecond
// Executor is the main interface for all the exec commands
type Executor interface {
ExecuteCommand(command string, arg ...string) error
ExecuteCommandWithEnv(env []string, command string, arg ...string) error
ExecuteCommandWithOutput(command string, arg ...string) (string, error)
ExecuteCommandWithCombinedOutput(command string, arg ...string) (string, error)
ExecuteCommandWithTimeout(timeout time.Duration, command string, arg ...string) (string, error)
ExecuteCommandWithStdin(timeout time.Duration, command string, stdin *string, arg ...string) error
}
// CommandExecutor is the type of the Executor
type CommandExecutor struct{}
// ExecuteCommand starts a process and wait for its completion
func (c *CommandExecutor) ExecuteCommand(command string, arg ...string) error {
return c.ExecuteCommandWithEnv([]string{}, command, arg...)
}
// ExecuteCommandWithStdin starts a process, provides stdin and wait for its completion with timeout.
func (c *CommandExecutor) ExecuteCommandWithStdin(timeout time.Duration, command string, stdin *string, arg ...string) error {
output, err := executeCommandWithTimeout(timeout, command, stdin, arg...)
logger.Infof("Command %q output: %q", command, output)
return err
}
// ExecuteCommandWithEnv starts a process with env variables and wait for its completion
func (*CommandExecutor) ExecuteCommandWithEnv(env []string, command string, arg ...string) error {
cmd, stdout, stderr, err := startCommand(env, command, arg...)
if err != nil {
return err
}
logOutput(stdout, stderr)
if err := cmd.Wait(); err != nil {
return err
}
return nil
}
// IsTimeout returns true if the error is due to a timeout in the exec function. Note that it cannot
// determine if a command timed out due to behavior of the command itself; for example if a
// '--timeout' flag was passed to the command.
func IsTimeout(err error) bool {
return strings.Contains(err.Error(), TimeoutWaitingForMessage)
}
// ExecuteCommandWithTimeout starts a process and wait for its completion with timeout.
func (*CommandExecutor) ExecuteCommandWithTimeout(timeout time.Duration, command string, arg ...string) (string, error) {
return executeCommandWithTimeout(timeout, command, nil, arg...)
}
// executeCommandWithTimeout starts a process, provides stdin and wait for its completion with timeout.
func executeCommandWithTimeout(timeout time.Duration, command string, stdin *string, arg ...string) (string, error) {
logCommand(command, arg...)
//nolint:gosec // Rook controls the input to the exec arguments
cmd := exec.Command(command, arg...)
var b bytes.Buffer
cmd.Stdout = &b
cmd.Stderr = &b
if stdin != nil {
cmd.Stdin = strings.NewReader(*stdin)
}
if err := cmd.Start(); err != nil {
return "", err
}
done := make(chan error, 1)
go func() {
done <- cmd.Wait()
}()
interruptSent := false
for {
select {
case <-time.After(timeout):
if interruptSent {
logger.Infof("%s process %s to return after interrupt signal was sent. Sending kill signal to the process", TimeoutWaitingForMessage, command)
if err := cmd.Process.Kill(); err != nil {
logger.Errorf("Failed to kill process %s: %v", command, err)
// The process may still be running with the output-copier
// goroutines writing into b, so don't read it here.
return "", fmt.Errorf("%s the command %s to return; sent an interrupt, then the kill failed: %v", TimeoutWaitingForMessage, command, err)
}
// Kill() only signals the process; the os/exec goroutines that copy
// its output into b are joined only by cmd.Wait() (done). Reading b
// before done fires races with those writers, so wait for them. Bound
// the wait, though — a killed process can leave an orphaned descendant
// holding the output pipe open (a D-state cryptsetup/dmsetup child, or
// the downstream of a "sh -c '... | head'" pipeline), so cmd.Wait() may
// never return. Give up on the captured output after a grace period
// rather than blocking the caller forever.
select {
case <-done:
return strings.TrimSpace(b.String()), fmt.Errorf("%s the command %s to return", TimeoutWaitingForMessage, command)
case <-time.After(outputDrainGracePeriod):
return "", fmt.Errorf("%s the command %s to return", TimeoutWaitingForMessage, command)
}
}
logger.Infof("%s process %s to return. Sending interrupt signal to the process", TimeoutWaitingForMessage, command)
if err := cmd.Process.Signal(os.Interrupt); err != nil {
logger.Errorf("Failed to send interrupt signal to process %s: %v", command, err)
// kill signal will be sent next loop
}
interruptSent = true
case err := <-done:
if err != nil {
return strings.TrimSpace(b.String()), err
}
if interruptSent {
return strings.TrimSpace(b.String()), fmt.Errorf("%s the command %s to return", TimeoutWaitingForMessage, command)
}
return strings.TrimSpace(b.String()), nil
}
}
}
// ExecuteCommandWithOutput executes a command with output
func (*CommandExecutor) ExecuteCommandWithOutput(command string, arg ...string) (string, error) {
logCommand(command, arg...)
//nolint:gosec // Rook controls the input to the exec arguments
cmd := exec.Command(command, arg...)
return runCommandWithOutput(cmd, false)
}
// ExecuteCommandWithCombinedOutput executes a command with combined output
func (*CommandExecutor) ExecuteCommandWithCombinedOutput(command string, arg ...string) (string, error) {
logCommand(command, arg...)
//nolint:gosec // Rook controls the input to the exec arguments
cmd := exec.Command(command, arg...)
return runCommandWithOutput(cmd, true)
}
func startCommand(env []string, command string, arg ...string) (*exec.Cmd, io.ReadCloser, io.ReadCloser, error) {
logCommand(command, arg...)
//nolint:gosec // Rook controls the input to the exec arguments
cmd := exec.Command(command, arg...)
stdout, err := cmd.StdoutPipe()
if err != nil {
logger.Warningf("failed to open stdout pipe: %+v", err)
}
stderr, err := cmd.StderrPipe()
if err != nil {
logger.Warningf("failed to open stderr pipe: %+v", err)
}
if len(env) > 0 {
cmd.Env = env
}
err = cmd.Start()
return cmd, stdout, stderr, err
}
// read from reader line by line and write it to the log
func logFromReader(logger *capnslog.PackageLogger, reader io.ReadCloser) {
l := logger.Debug
// If we are an OSD we must log using Info to print out stdout/stderr
if os.Getenv("ROOK_OSD_ID") != "" {
l = logger.Info
}
in := bufio.NewScanner(reader)
lastLine := ""
for in.Scan() {
lastLine = in.Text()
l(lastLine)
}
}
func logOutput(stdout, stderr io.ReadCloser) {
if stdout == nil || stderr == nil {
logger.Warningf("failed to collect stdout and stderr")
return
}
// The child processes should appropriately be outputting at the desired global level. Therefore,
// we always log at INFO level here, so that log statements from child procs at higher levels
// (e.g., WARNING) will still be displayed. We are relying on the child procs to output appropriately.
childLogger := capnslog.NewPackageLogger("github.com/rook/rook", "exec")
if !childLogger.LevelAt(capnslog.INFO) {
rl, err := capnslog.GetRepoLogger("github.com/rook/rook")
if err == nil {
rl.SetLogLevel(map[string]capnslog.LogLevel{"exec": capnslog.INFO})
}
}
go logFromReader(childLogger, stderr)
logFromReader(childLogger, stdout)
}
func runCommandWithOutput(cmd *exec.Cmd, combinedOutput bool) (string, error) {
var output []byte
var err error
var out string
if combinedOutput {
output, err = cmd.CombinedOutput()
} else {
output, err = cmd.Output()
if err != nil {
output = []byte(fmt.Sprintf("%s. %s", string(output), assertErrorType(err)))
}
}
out = strings.TrimSpace(string(output))
if err != nil {
return out, err
}
return out, nil
}
func logCommand(command string, arg ...string) {
logger.Debugf("Running command: %s %s", command, strings.Join(arg, " "))
}
func assertErrorType(err error) string {
switch errType := err.(type) {
case *exec.ExitError:
return string(errType.Stderr)
case *exec.Error:
return errType.Error()
}
return ""
}
// ExtractExitCode attempts to get the exit code from the error returned by an Executor function.
// This should also work for any errors returned by the golang os/exec package and "k8s.io/utils/exec"
func ExtractExitCode(err error) (int, error) {
switch errType := err.(type) {
case *exec.ExitError:
return errType.ExitCode(), nil
case *kexec.CodeExitError:
return errType.ExitStatus(), nil
// have to check both *kexec.CodeExitError and kexec.CodeExitError because CodeExitError methods
// are not defined with pointer receivers; both pointer and non-pointers are valid `error`s.
case kexec.CodeExitError:
return errType.ExitStatus(), nil
case *kerrors.StatusError:
return int(errType.ErrStatus.Code), nil
default:
logger.Debugf("%s", err.Error())
// This is ugly, but it's a decent backup just in case the error isn't a type above.
if strings.Contains(err.Error(), "command terminated with exit code") {
a := strings.SplitAfter(err.Error(), "command terminated with exit code")
return strconv.Atoi(strings.TrimSpace(a[1]))
}
return -1, errors.Errorf("error %#v is an unknown error type: %v", err, reflect.TypeOf(err))
}
}