GitList

Browse code

Update containerd to aa5e000c963756778ab3ebd1a12c6

This includes a patch on top of containerd 1.2.1 to handle fifo
timeouts.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Michael Crosby authored on 2018/12/15 05:41:41
Showing 4 changed files

hack/dockerfile/install/containerd.installer index d0cebb8..3300b2d 100755
vendor.conf index d46bb2d..2d3ca97 100644
vendor/github.com/containerd/containerd/runtime/v1/linux/proc/exec.go index 4c0e99e..cefce6c 100644
vendor/github.com/containerd/containerd/runtime/v1/linux/proc/init.go index fa23b5e..c76bcfe 100644

hack/dockerfile/install/containerd.installer

History View file @ e5d9d72

@@ -4,7 +4,7 @@
                      # containerd is also pinned in vendor.conf. When updating the binary
                      # version you may also need to update the vendor version to pick up bug
                      # fixes or new APIs.
                     -CONTAINERD_COMMIT=9b32062dc1f5a7c2564315c269b5059754f12b9d # v1.2.1
                     +CONTAINERD_COMMIT=aa5e000c963756778ab3ebd1a12c67449c503a34 # v1.2.1+
                      install_containerd() {
                      	echo "Install containerd version $CONTAINERD_COMMIT"

vendor.conf

History View file @ e5d9d72

@@ -118,7 +118,7 @@ github.com/googleapis/gax-go v2.0.0
                      google.golang.org/genproto 694d95ba50e67b2e363f3483057db5d4910c18f9
                      # containerd
                     -github.com/containerd/containerd 9b32062dc1f5a7c2564315c269b5059754f12b9d # v1.2.1
                     +github.com/containerd/containerd aa5e000c963756778ab3ebd1a12c67449c503a34 # v1.2.1+
                      github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
                      github.com/containerd/continuity 004b46473808b3e7a4a3049c20e4376c91eb966d
                      github.com/containerd/cgroups 5e610833b72089b37d0e615de9a92dfc043757c2

vendor/github.com/containerd/containerd/runtime/v1/linux/proc/exec.go

History View file @ e5d9d72

@@ -209,22 +209,27 @@ func (e *execProcess) start(ctx context.Context) (err error) {
 		e.stdin = sc
 	}
 	var copyWaitGroup sync.WaitGroup
+	ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
 	if socket != nil {
 		console, err := socket.ReceiveMaster()
 		if err != nil {
+			cancel()
 			return errors.Wrap(err, "failed to retrieve console master")
 		}
 		if e.console, err = e.parent.Platform.CopyConsole(ctx, console, e.stdio.Stdin, e.stdio.Stdout, e.stdio.Stderr, &e.wg, &copyWaitGroup); err != nil {
+			cancel()
 			return errors.Wrap(err, "failed to start console copy")
 		}
 	} else if !e.stdio.IsNull() {
 		if err := copyPipes(ctx, e.io, e.stdio.Stdin, e.stdio.Stdout, e.stdio.Stderr, &e.wg, &copyWaitGroup); err != nil {
+			cancel()
 			return errors.Wrap(err, "failed to start io pipe copy")
 		}
 	}
 	copyWaitGroup.Wait()
 	pid, err := runc.ReadPidFile(opts.PidFile)
 	if err != nil {
+		cancel()
 		return errors.Wrap(err, "failed to retrieve OCI runtime exec pid")
 	}
 	e.pid = pid

vendor/github.com/containerd/containerd/runtime/v1/linux/proc/init.go

History View file @ e5d9d72

@@ -168,18 +168,22 @@ func (p *Init) Create(ctx context.Context, r *CreateConfig) error {
                      		p.closers = append(p.closers, sc)
+                     	}
                      	var copyWaitGroup sync.WaitGroup
                     +	ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
                      	if socket != nil {
                      		console, err := socket.ReceiveMaster()
                      		if err != nil {
                     +			cancel()
                      			return errors.Wrap(err, "failed to retrieve console master")
+                     		}
                      		console, err = p.Platform.CopyConsole(ctx, console, r.Stdin, r.Stdout, r.Stderr, &p.wg, &copyWaitGroup)
                      		if err != nil {
                     +			cancel()
                      			return errors.Wrap(err, "failed to start console copy")
+                     		}
                      		p.console = console
                      	} else if !hasNoIO(r) {
                      		if err := copyPipes(ctx, p.io, r.Stdin, r.Stdout, r.Stderr, &p.wg, &copyWaitGroup); err != nil {
                     +			cancel()
                      			return errors.Wrap(err, "failed to start io pipe copy")
+                     		}
+                     	}
@@ -187,6 +191,7 @@ func (p *Init) Create(ctx context.Context, r *CreateConfig) error {
                      	copyWaitGroup.Wait()
                      	pid, err := runc.ReadPidFile(pidFile)
                      	if err != nil {
                     +		cancel()
                      		return errors.Wrap(err, "failed to retrieve OCI runtime container pid")
+                     	}
                      	p.pid = pid

...	...	@@ -209,22 +209,27 @@ func (e *execProcess) start(ctx context.Context) (err error) {
209	209	e.stdin = sc
210	210	}
211	211	var copyWaitGroup sync.WaitGroup
	212	+ ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
212	213	if socket != nil {
213	214	console, err := socket.ReceiveMaster()
214	215	if err != nil {
	216	+ cancel()
215	217	return errors.Wrap(err, "failed to retrieve console master")
216	218	}
217	219	if e.console, err = e.parent.Platform.CopyConsole(ctx, console, e.stdio.Stdin, e.stdio.Stdout, e.stdio.Stderr, &e.wg, &copyWaitGroup); err != nil {
	220	+ cancel()
218	221	return errors.Wrap(err, "failed to start console copy")
219	222	}
220	223	} else if !e.stdio.IsNull() {
221	224	if err := copyPipes(ctx, e.io, e.stdio.Stdin, e.stdio.Stdout, e.stdio.Stderr, &e.wg, &copyWaitGroup); err != nil {
	225	+ cancel()
222	226	return errors.Wrap(err, "failed to start io pipe copy")
223	227	}
224	228	}
225	229	copyWaitGroup.Wait()
226	230	pid, err := runc.ReadPidFile(opts.PidFile)
227	231	if err != nil {
	232	+ cancel()
228	233	return errors.Wrap(err, "failed to retrieve OCI runtime exec pid")
229	234	}
230	235	e.pid = pid