 6b9be1bfc3
			
		
	
	6b9be1bfc3
	
	
	
		
			
			Creating a direct IO should not overwrite the fifo configuration. The fifo configuration can be updated before creating the direct io if needed. This fixes an expected change in behavior for clients who were calling NewDirectIO previously with terminal configured on the fifo. Signed-off-by: Derek McGowan <derek@mcgstyle.net>
		
			
				
	
	
		
			159 lines
		
	
	
		
			3.7 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			159 lines
		
	
	
		
			3.7 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // +build !windows
 | |
| 
 | |
| /*
 | |
|    Copyright The containerd Authors.
 | |
| 
 | |
|    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 cio
 | |
| 
 | |
| import (
 | |
| 	"context"
 | |
| 	"io"
 | |
| 	"io/ioutil"
 | |
| 	"os"
 | |
| 	"path/filepath"
 | |
| 	"sync"
 | |
| 	"syscall"
 | |
| 
 | |
| 	"github.com/containerd/fifo"
 | |
| 	"github.com/pkg/errors"
 | |
| )
 | |
| 
 | |
| // NewFIFOSetInDir returns a new FIFOSet with paths in a temporary directory under root
 | |
| func NewFIFOSetInDir(root, id string, terminal bool) (*FIFOSet, error) {
 | |
| 	if root != "" {
 | |
| 		if err := os.MkdirAll(root, 0700); err != nil {
 | |
| 			return nil, err
 | |
| 		}
 | |
| 	}
 | |
| 	dir, err := ioutil.TempDir(root, "")
 | |
| 	if err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 	closer := func() error {
 | |
| 		return os.RemoveAll(dir)
 | |
| 	}
 | |
| 	return NewFIFOSet(Config{
 | |
| 		Stdin:    filepath.Join(dir, id+"-stdin"),
 | |
| 		Stdout:   filepath.Join(dir, id+"-stdout"),
 | |
| 		Stderr:   filepath.Join(dir, id+"-stderr"),
 | |
| 		Terminal: terminal,
 | |
| 	}, closer), nil
 | |
| }
 | |
| 
 | |
| func copyIO(fifos *FIFOSet, ioset *Streams) (*cio, error) {
 | |
| 	var ctx, cancel = context.WithCancel(context.Background())
 | |
| 	pipes, err := openFifos(ctx, fifos)
 | |
| 	if err != nil {
 | |
| 		cancel()
 | |
| 		return nil, err
 | |
| 	}
 | |
| 
 | |
| 	if fifos.Stdin != "" {
 | |
| 		go func() {
 | |
| 			p := bufPool.Get().(*[]byte)
 | |
| 			defer bufPool.Put(p)
 | |
| 
 | |
| 			io.CopyBuffer(pipes.Stdin, ioset.Stdin, *p)
 | |
| 			pipes.Stdin.Close()
 | |
| 		}()
 | |
| 	}
 | |
| 
 | |
| 	var wg = &sync.WaitGroup{}
 | |
| 	wg.Add(1)
 | |
| 	go func() {
 | |
| 		p := bufPool.Get().(*[]byte)
 | |
| 		defer bufPool.Put(p)
 | |
| 
 | |
| 		io.CopyBuffer(ioset.Stdout, pipes.Stdout, *p)
 | |
| 		pipes.Stdout.Close()
 | |
| 		wg.Done()
 | |
| 	}()
 | |
| 
 | |
| 	if !fifos.Terminal {
 | |
| 		wg.Add(1)
 | |
| 		go func() {
 | |
| 			p := bufPool.Get().(*[]byte)
 | |
| 			defer bufPool.Put(p)
 | |
| 
 | |
| 			io.CopyBuffer(ioset.Stderr, pipes.Stderr, *p)
 | |
| 			pipes.Stderr.Close()
 | |
| 			wg.Done()
 | |
| 		}()
 | |
| 	}
 | |
| 	return &cio{
 | |
| 		config:  fifos.Config,
 | |
| 		wg:      wg,
 | |
| 		closers: append(pipes.closers(), fifos),
 | |
| 		cancel:  cancel,
 | |
| 	}, nil
 | |
| }
 | |
| 
 | |
| func openFifos(ctx context.Context, fifos *FIFOSet) (pipes, error) {
 | |
| 	var err error
 | |
| 	defer func() {
 | |
| 		if err != nil {
 | |
| 			fifos.Close()
 | |
| 		}
 | |
| 	}()
 | |
| 
 | |
| 	var f pipes
 | |
| 	if fifos.Stdin != "" {
 | |
| 		if f.Stdin, err = fifo.OpenFifo(ctx, fifos.Stdin, syscall.O_WRONLY|syscall.O_CREAT|syscall.O_NONBLOCK, 0700); err != nil {
 | |
| 			return f, errors.Wrapf(err, "failed to open stdin fifo")
 | |
| 		}
 | |
| 		defer func() {
 | |
| 			if err != nil && f.Stdin != nil {
 | |
| 				f.Stdin.Close()
 | |
| 			}
 | |
| 		}()
 | |
| 	}
 | |
| 	if fifos.Stdout != "" {
 | |
| 		if f.Stdout, err = fifo.OpenFifo(ctx, fifos.Stdout, syscall.O_RDONLY|syscall.O_CREAT|syscall.O_NONBLOCK, 0700); err != nil {
 | |
| 			return f, errors.Wrapf(err, "failed to open stdout fifo")
 | |
| 		}
 | |
| 		defer func() {
 | |
| 			if err != nil && f.Stdout != nil {
 | |
| 				f.Stdout.Close()
 | |
| 			}
 | |
| 		}()
 | |
| 	}
 | |
| 	if fifos.Stderr != "" {
 | |
| 		if f.Stderr, err = fifo.OpenFifo(ctx, fifos.Stderr, syscall.O_RDONLY|syscall.O_CREAT|syscall.O_NONBLOCK, 0700); err != nil {
 | |
| 			return f, errors.Wrapf(err, "failed to open stderr fifo")
 | |
| 		}
 | |
| 	}
 | |
| 	return f, nil
 | |
| }
 | |
| 
 | |
| // NewDirectIO returns an IO implementation that exposes the IO streams as io.ReadCloser
 | |
| // and io.WriteCloser.
 | |
| func NewDirectIO(ctx context.Context, fifos *FIFOSet) (*DirectIO, error) {
 | |
| 	ctx, cancel := context.WithCancel(ctx)
 | |
| 	pipes, err := openFifos(ctx, fifos)
 | |
| 	return &DirectIO{
 | |
| 		pipes: pipes,
 | |
| 		cio: cio{
 | |
| 			config:  fifos.Config,
 | |
| 			closers: append(pipes.closers(), fifos),
 | |
| 			cancel:  cancel,
 | |
| 		},
 | |
| 	}, err
 | |
| }
 | |
| 
 | |
| func (p *pipes) closers() []io.Closer {
 | |
| 	return []io.Closer{p.Stdin, p.Stdout, p.Stderr}
 | |
| }
 |