Files
my-rook-config/pkg/util/exec/exec.go
T
Noah Watkins fbb56c41ed exec: interleave stdout/stderr logging
The io.MultiReader(r1, r2) reads r1 until EOF before moving on to r2.
When used for stdout/stderr stderr will not be written to the log until
stdout reaches EOF. This patch reads stderr in a go routine so that the
two streams can be interleaved properly.

Fixes: #2479

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2019-01-24 13:10:46 -08:00

248 lines
7.8 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"
"io/ioutil"
"os"
"os/exec"
"strings"
"time"
"github.com/coreos/pkg/capnslog"
)
type Executor interface {
StartExecuteCommand(debug bool, actionName string, command string, arg ...string) (*exec.Cmd, error)
ExecuteCommand(debug bool, actionName string, command string, arg ...string) error
ExecuteCommandWithOutput(debug bool, actionName string, command string, arg ...string) (string, error)
ExecuteCommandWithCombinedOutput(debug bool, actionName string, command string, arg ...string) (string, error)
ExecuteCommandWithOutputFile(debug bool, actionName, command, outfileArg string, arg ...string) (string, error)
ExecuteCommandWithTimeout(debug bool, timeout time.Duration, actionName string, command string, arg ...string) (string, error)
ExecuteStat(name string) (os.FileInfo, error)
}
type CommandExecutor struct {
}
// Start a process and return immediately
func (*CommandExecutor) StartExecuteCommand(debug bool, actionName string, command string, arg ...string) (*exec.Cmd, error) {
cmd, stdout, stderr, err := startCommand(debug, command, arg...)
if err != nil {
return cmd, createCommandError(err, actionName)
}
go logOutput(actionName, stdout, stderr)
return cmd, nil
}
// Start a process and wait for its completion
func (*CommandExecutor) ExecuteCommand(debug bool, actionName string, command string, arg ...string) error {
cmd, stdout, stderr, err := startCommand(debug, command, arg...)
if err != nil {
return createCommandError(err, actionName)
}
logOutput(actionName, stdout, stderr)
if err := cmd.Wait(); err != nil {
return createCommandError(err, actionName)
}
return nil
}
// ExecuteCommandWithTimeout starts a process and wait for its completion with timeout.
func (*CommandExecutor) ExecuteCommandWithTimeout(debug bool, timeout time.Duration, actionName string, command string, arg ...string) (string, error) {
logCommand(debug, command, arg...)
cmd := exec.Command(command, arg...)
var b bytes.Buffer
cmd.Stdout = &b
cmd.Stderr = &b
if err := cmd.Start(); err != nil {
return "", createCommandError(err, actionName)
}
done := make(chan error, 1)
go func() {
done <- cmd.Wait()
}()
interrupSent := false
for {
select {
case <-time.After(timeout):
if interrupSent {
logger.Infof("Timeout waiting for process %s to return after interrupt signal was sent. Sending kill signal to the process", command)
var e error
if err := cmd.Process.Kill(); err != nil {
logger.Errorf("Failed to kill process %s: %+v", command, err)
e = fmt.Errorf("Timeout waiting for the command %s to return after interrupt signal was sent. Tried to kill the process but that failed: %+v", command, err)
} else {
e = fmt.Errorf("Timeout waiting for the command %s to return", command)
}
return strings.TrimSpace(string(b.Bytes())), createCommandError(e, command)
}
logger.Infof("Timeout waiting for process %s to return. Sending interrupt signal to the process", 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
}
interrupSent = true
case err := <-done:
if err != nil {
return strings.TrimSpace(string(b.Bytes())), createCommandError(err, command)
}
if interrupSent {
e := fmt.Errorf("Timeout waiting for the command %s to return", command)
return strings.TrimSpace(string(b.Bytes())), createCommandError(e, command)
}
return strings.TrimSpace(string(b.Bytes())), nil
}
}
}
func (*CommandExecutor) ExecuteCommandWithOutput(debug bool, actionName string, command string, arg ...string) (string, error) {
logCommand(debug, command, arg...)
cmd := exec.Command(command, arg...)
return runCommandWithOutput(actionName, cmd, false)
}
func (*CommandExecutor) ExecuteCommandWithCombinedOutput(debug bool, actionName string, command string, arg ...string) (string, error) {
logCommand(debug, command, arg...)
cmd := exec.Command(command, arg...)
return runCommandWithOutput(actionName, cmd, true)
}
func (*CommandExecutor) ExecuteCommandWithOutputFile(debug bool, actionName string, command, outfileArg string, arg ...string) (string, error) {
// create a temporary file to serve as the output file for the command to be run and ensure
// it is cleaned up after this function is done
outFile, err := ioutil.TempFile("", "")
if err != nil {
return "", fmt.Errorf("failed to open output file: %+v", err)
}
defer outFile.Close()
defer os.Remove(outFile.Name())
// append the output file argument to the list or args
arg = append(arg, outfileArg, outFile.Name())
logCommand(debug, command, arg...)
cmd := exec.Command(command, arg...)
cmdOut, err := cmd.CombinedOutput()
// if there was anything that went to stdout/stderr then log it, even before we return an error
if string(cmdOut) != "" {
logger.Info(string(cmdOut))
}
if err != nil {
return string(cmdOut), err
}
// read the entire output file and return that to the caller
fileOut, err := ioutil.ReadAll(outFile)
return string(fileOut), err
}
func startCommand(debug bool, command string, arg ...string) (*exec.Cmd, io.ReadCloser, io.ReadCloser, error) {
logCommand(debug, command, arg...)
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)
}
err = cmd.Start()
return cmd, stdout, stderr, err
}
func (*CommandExecutor) ExecuteStat(name string) (os.FileInfo, error) {
return os.Stat(name)
}
// read from reader line by line and write it to the log
func logFromReader(logger *capnslog.PackageLogger, reader io.ReadCloser) {
in := bufio.NewScanner(reader)
lastLine := ""
for in.Scan() {
lastLine = in.Text()
logger.Info(lastLine)
}
}
func logOutput(name string, 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", name)
if !childLogger.LevelAt(capnslog.INFO) {
rl, err := capnslog.GetRepoLogger("github.com/rook/rook")
if err == nil {
rl.SetLogLevel(map[string]capnslog.LogLevel{name: capnslog.INFO})
}
}
go logFromReader(childLogger, stderr)
logFromReader(childLogger, stdout)
}
func runCommandWithOutput(actionName string, cmd *exec.Cmd, combinedOutput bool) (string, error) {
var output []byte
var err error
if combinedOutput {
output, err = cmd.CombinedOutput()
} else {
output, err = cmd.Output()
}
out := strings.TrimSpace(string(output))
if err != nil {
return out, createCommandError(err, actionName)
}
return out, nil
}
func logCommand(debug bool, command string, arg ...string) {
msg := fmt.Sprintf("Running command: %s %s", command, strings.Join(arg, " "))
if debug {
logger.Debug(msg)
} else {
logger.Info(msg)
}
}