github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1370 from crosbymichael/daemon-lock

Browse Source 
Defer unlock for testing daemon
This commit is contained in:
Phil Estes 2017-08-17 11:44:44 -04:00 committed by GitHub
commit 89daacfe3f
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
daemon_test.go
View File

@ -60,7 +60,7 @@ func (d *daemon) waitForStart(ctx context.Context) (*Client, error) {
func (d *daemon) Stop() error { func (d *daemon) Stop() error {
d.Lock() d.Lock()
d.Unlock() defer d.Unlock()
if d.cmd == nil { if d.cmd == nil {
return errors.New("daemon is not running") return errors.New("daemon is not running")
} }
@ -69,7 +69,7 @@ func (d *daemon) Stop() error {
func (d *daemon) Kill() error { func (d *daemon) Kill() error {
d.Lock() d.Lock()
d.Unlock() defer d.Unlock()
if d.cmd == nil { if d.cmd == nil {
return errors.New("daemon is not running") return errors.New("daemon is not running")
} }
@ -78,7 +78,7 @@ func (d *daemon) Kill() error {
func (d *daemon) Wait() error { func (d *daemon) Wait() error {
d.Lock() d.Lock()
d.Unlock() defer d.Unlock()
if d.cmd == nil { if d.cmd == nil {
return errors.New("daemon is not running") return errors.New("daemon is not running")
} }
@ -87,7 +87,7 @@ func (d *daemon) Wait() error {
func (d *daemon) Restart() error { func (d *daemon) Restart() error {
d.Lock() d.Lock()
d.Unlock() defer d.Unlock()
if d.cmd == nil { if d.cmd == nil {
return errors.New("daemon is not running") return errors.New("daemon is not running")
} }

10
io_unix.go
View File

@ -36,6 +36,7 @@ func copyIO(fifos *FIFOSet, ioset *ioSet, tty bool) (_ *wgCloser, err error) {
var ( var (
f io.ReadWriteCloser f io.ReadWriteCloser
set []io.Closer set []io.Closer
cwg sync.WaitGroup
ctx, cancel = context.WithCancel(context.Background()) ctx, cancel = context.WithCancel(context.Background())
wg = &sync.WaitGroup{} wg = &sync.WaitGroup{}
) )
@ -52,9 +53,13 @@ func copyIO(fifos *FIFOSet, ioset *ioSet, tty bool) (_ *wgCloser, err error) {
return nil, err return nil, err
} }
set = append(set, f) set = append(set, f)
cwg.Add(1)
wg.Add(1)
go func(w io.WriteCloser) { go func(w io.WriteCloser) {
cwg.Done()
io.Copy(w, ioset.in) io.Copy(w, ioset.in)
w.Close() w.Close()
wg.Done()
}(f) }(f)
if f, err = fifo.OpenFifo(ctx, fifos.Out, syscall.O_RDONLY|syscall.O_CREAT|syscall.O_NONBLOCK, 0700); err != nil { if f, err = fifo.OpenFifo(ctx, fifos.Out, syscall.O_RDONLY|syscall.O_CREAT|syscall.O_NONBLOCK, 0700); err != nil {
@ -62,7 +67,9 @@ func copyIO(fifos *FIFOSet, ioset *ioSet, tty bool) (_ *wgCloser, err error) {
} }
set = append(set, f) set = append(set, f)
wg.Add(1) wg.Add(1)
cwg.Add(1)
go func(r io.ReadCloser) { go func(r io.ReadCloser) {
cwg.Done()
io.Copy(ioset.out, r) io.Copy(ioset.out, r)
r.Close() r.Close()
wg.Done() wg.Done()
@ -75,12 +82,15 @@ func copyIO(fifos *FIFOSet, ioset *ioSet, tty bool) (_ *wgCloser, err error) {
if !tty { if !tty {
wg.Add(1) wg.Add(1)
cwg.Add(1)
go func(r io.ReadCloser) { go func(r io.ReadCloser) {
cwg.Done()
io.Copy(ioset.err, r) io.Copy(ioset.err, r)
r.Close() r.Close()
wg.Done() wg.Done()
}(f) }(f)
} }
cwg.Wait()
return &wgCloser{ return &wgCloser{
wg: wg, wg: wg,
dir: fifos.Dir, dir: fifos.Dir,