extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-06-07 02:18:01 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
endpoint/endpoint.go
View File

@ -89,7 +89,7 @@ func (p *Sender) Send(ctx context.Context, r *pdu.SendReq) (*pdu.SendRes, io.Rea
} }
return &pdu.SendRes{ExpectedSize: expSize}, nil, nil return &pdu.SendRes{ExpectedSize: expSize}, nil, nil
} else { } else {
stream, err := zfs.ZFSSend(r.Filesystem, r.From, r.To, "") stream, err := zfs.ZFSSend(ctx, r.Filesystem, r.From, r.To, "")
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
@ -279,7 +279,7 @@ func (e *Receiver) Receive(ctx context.Context, req *pdu.ReceiveReq, sendStream
getLogger(ctx).Debug("start receive command") getLogger(ctx).Debug("start receive command")
if err := zfs.ZFSRecv(lp.ToString(), sendStream, args...); err != nil { if err := zfs.ZFSRecv(ctx, lp.ToString(), sendStream, args...); err != nil {
getLogger(ctx). getLogger(ctx).
WithError(err). WithError(err).
WithField("args", args). WithField("args", args).

9
util/iocommand.go
View File

@ -2,6 +2,7 @@ package util
import ( import (
"bytes" "bytes"
"context"
"fmt" "fmt"
"io" "io"
"os" "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) 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) { func RunIOCommand(ctx context.Context, command string, args ...string) (c *IOCommand, err error) {
c, err = NewIOCommand(command, args, IOCommandStderrBufSize) c, err = NewIOCommand(ctx, command, args, IOCommandStderrBufSize)
if err != nil { if err != nil {
return return
} }
@ -43,7 +44,7 @@ func RunIOCommand(command string, args ...string) (c *IOCommand, err error) {
return 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 { if stderrBufSize == 0 {
stderrBufSize = IOCommandStderrBufSize stderrBufSize = IOCommandStderrBufSize
@ -51,7 +52,7 @@ func NewIOCommand(command string, args []string, stderrBufSize int) (c *IOComman
c = &IOCommand{} c = &IOCommand{}
c.Cmd = exec.Command(command, args...) c.Cmd = exec.CommandContext(ctx, command, args...)
if c.Stdout, err = c.Cmd.StdoutPipe(); err != nil { if c.Stdout, err = c.Cmd.StdoutPipe(); err != nil {
return return

29
zfs/zfs.go
View File

@ -317,7 +317,7 @@ func buildCommonSendArgs(fs string, from, to string, token string) ([]string, er
// if token != "", then send -t token is used // if token != "", then send -t token is used
// otherwise send [-i from] to is used // otherwise send [-i from] to is used
// (if from is "" a full ZFS send is done) // (if from is "" a full ZFS send is done)
func ZFSSend(fs string, from, to string, token string) (stream io.ReadCloser, err error) { func ZFSSend(ctx context.Context, fs string, from, to string, token string) (stream io.ReadCloser, err error) {
args := make([]string, 0) args := make([]string, 0)
args = append(args, "send") args = append(args, "send")
@ -328,7 +328,7 @@ func ZFSSend(fs string, from, to string, token string) (stream io.ReadCloser, er
} }
args = append(args, sargs...) args = append(args, sargs...)
stream, err = util.RunIOCommand(ZFS_BINARY, args...) stream, err = util.RunIOCommand(ctx, ZFS_BINARY, args...)
return return
} }
@ -455,7 +455,7 @@ func ZFSSendDry(fs string, from, to string, token string) (_ *DrySendInfo, err e
} }
func ZFSRecv(fs string, stream io.Reader, additionalArgs ...string) (err error) { func ZFSRecv(ctx context.Context, fs string, stream io.Reader, additionalArgs ...string) (err error) {
if err := validateZFSFilesystem(fs); err != nil { if err := validateZFSFilesystem(fs); err != nil {
return err return err
@ -468,7 +468,7 @@ func ZFSRecv(fs string, stream io.Reader, additionalArgs ...string) (err error)
} }
args = append(args, fs) args = append(args, fs)
cmd := exec.Command(ZFS_BINARY, args...) cmd := exec.CommandContext(ctx, ZFS_BINARY, args...)
stderr := bytes.NewBuffer(make([]byte, 0, 1024)) stderr := bytes.NewBuffer(make([]byte, 0, 1024))
cmd.Stderr = stderr cmd.Stderr = stderr
@ -523,27 +523,6 @@ func ZFSRecvClearResumeToken(fs string) (err error) {
return nil return nil
} }
func ZFSRecvWriter(fs *DatasetPath, additionalArgs ...string) (io.WriteCloser, error) {
args := make([]string, 0)
args = append(args, "recv")
if len(args) > 0 {
args = append(args, additionalArgs...)
}
args = append(args, fs.ToString())
cmd, err := util.NewIOCommand(ZFS_BINARY, args, 1024)
if err != nil {
return nil, err
}
if err = cmd.Start(); err != nil {
return nil, err
}
return cmd.Stdin, nil
}
type ZFSProperties struct { type ZFSProperties struct {
m map[string]string m map[string]string
} }