mirror of
https://github.com/zrepl/zrepl.git
synced 2024-11-25 09:54:47 +01:00
go1.19: zfs.SendStream.Close() after EOF would return context cancellation error
Before upgrading to Go 1.19, these platform tests would sproadically fail due to the reason outlined in the comment github.com/zrepl/zrepl/platformtest/tests.SendStreamMultipleCloseAfterEOF github.com/zrepl/zrepl/platformtest/tests.SendStreamCloseAfterEOFRead
This commit is contained in:
parent
c0b52b92d5
commit
a4cea1b4f3
26
zfs/zfs.go
26
zfs/zfs.go
@ -343,7 +343,6 @@ const (
|
|||||||
|
|
||||||
type SendStream struct {
|
type SendStream struct {
|
||||||
cmd *zfscmd.Cmd
|
cmd *zfscmd.Cmd
|
||||||
kill context.CancelFunc
|
|
||||||
stdoutReader io.ReadCloser // not *os.File for mocking during platformtest
|
stdoutReader io.ReadCloser // not *os.File for mocking during platformtest
|
||||||
stderrBuf *circlog.CircularLog
|
stderrBuf *circlog.CircularLog
|
||||||
|
|
||||||
@ -416,8 +415,29 @@ func (s *SendStream) killAndWait() error {
|
|||||||
debug("sendStream: killAndWait enter")
|
debug("sendStream: killAndWait enter")
|
||||||
defer debug("sendStream: killAndWait leave")
|
defer debug("sendStream: killAndWait leave")
|
||||||
|
|
||||||
|
// ensure this function is only called once
|
||||||
|
if s.state != sendStreamOpen {
|
||||||
|
panic(s.state)
|
||||||
|
}
|
||||||
|
|
||||||
// send SIGKILL
|
// send SIGKILL
|
||||||
s.kill()
|
// In an earlier version, we used the starting context.Context's cancel function
|
||||||
|
// for this, but in Go > 1.19, doing so will cause .Wait() to return the
|
||||||
|
// context cancel error instead of the *exec.ExitError.
|
||||||
|
err := s.cmd.Process().Kill()
|
||||||
|
if err != nil {
|
||||||
|
if err == os.ErrProcessDone {
|
||||||
|
// This can happen if
|
||||||
|
// (1) the process has already been .Wait()ed, or
|
||||||
|
// (2) some other goroutine cancels the context, likely further up
|
||||||
|
// the context tree.
|
||||||
|
// Case (1) can't happen to us because we only call
|
||||||
|
// this function in sendStreamOpen state.
|
||||||
|
// In Case (2), it's still our job to .Wait(), so, fallthrough.
|
||||||
|
} else {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Close our read-end of the pipe.
|
// Close our read-end of the pipe.
|
||||||
//
|
//
|
||||||
@ -963,10 +983,10 @@ func ZFSSend(ctx context.Context, sendArgs ZFSSendArgsValidated) (*SendStream, e
|
|||||||
|
|
||||||
stream := &SendStream{
|
stream := &SendStream{
|
||||||
cmd: cmd,
|
cmd: cmd,
|
||||||
kill: cancel,
|
|
||||||
stdoutReader: stdoutReader,
|
stdoutReader: stdoutReader,
|
||||||
stderrBuf: stderrBuf,
|
stderrBuf: stderrBuf,
|
||||||
}
|
}
|
||||||
|
_ = cancel // the SendStream.killAndWait() will kill the process
|
||||||
|
|
||||||
return stream, nil
|
return stream, nil
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user