extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-08-18 10:49:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

endpoint + zfs: context cancellation of util.IOCommand instances (send & recv for now)

Browse Source
This commit is contained in:
Christian Schwarz
2018-10-19 16:12:21 +02:00
parent ace4f3d892
commit 814fec60f0
3 changed files with 11 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
util/iocommand.go
View File

@@ -2,6 +2,7 @@ package util
import (
"bytes"
"context"
"fmt"
"io"
"os"
@@ -34,8 +35,8 @@ func (e IOCommandError) Error() string {
return fmt.Sprintf("underlying process exited with error: %s\nstderr: %s\n", e.WaitErr, e.Stderr)
}
func RunIOCommand(command string, args ...string) (c *IOCommand, err error) {
c, err = NewIOCommand(command, args, IOCommandStderrBufSize)
func RunIOCommand(ctx context.Context, command string, args ...string) (c *IOCommand, err error) {
c, err = NewIOCommand(ctx, command, args, IOCommandStderrBufSize)
if err != nil {
return
}
@@ -43,7 +44,7 @@ func RunIOCommand(command string, args ...string) (c *IOCommand, err error) {
return
}
func NewIOCommand(command string, args []string, stderrBufSize int) (c *IOCommand, err error) {
func NewIOCommand(ctx context.Context, command string, args []string, stderrBufSize int) (c *IOCommand, err error) {
if stderrBufSize == 0 {
stderrBufSize = IOCommandStderrBufSize
@@ -51,7 +52,7 @@ func NewIOCommand(command string, args []string, stderrBufSize int) (c *IOComman
c = &IOCommand{}
c.Cmd = exec.Command(command, args...)
c.Cmd = exec.CommandContext(ctx, command, args...)
if c.Stdout, err = c.Cmd.StdoutPipe(); err != nil {
return