Merge pull request #3117 from crosbymichael/exec-load

estesp · web-flow · commit 8ea28ff56494 · 2019-03-22T13:20:51.000-04:00
Fastpath opt and ExecProcess loading
diff --git a/oci/spec_opts.go b/oci/spec_opts.go
@@ -774,6 +774,7 @@ func removeCap(caps *[]string, s string) {
 	for i, c := range *caps {
 		if c == s {
 			*caps = append((*caps)[:i], (*caps)[i+1:]...)
+			return
 		}
 	}
 }
diff --git a/task.go b/task.go
@@ -521,6 +521,9 @@ func (t *task) Update(ctx context.Context, opts ...UpdateTaskOpts) error {
 }
 
 func (t *task) LoadProcess(ctx context.Context, id string, ioAttach cio.Attach) (Process, error) {
+	if id == t.id && ioAttach == nil {
+		return t, nil
+	}
 	response, err := t.client.TaskService().Get(ctx, &tasks.GetRequest{
 		ContainerID: t.id,
 		ExecID:      id,

Original file line number	Diff line number	Diff line change
`@@ -774,6 +774,7 @@ func removeCap(caps *[]string, s string) {`
`774`	`774`	`for i, c := range *caps {`
`775`	`775`	`if c == s {`
`776`	`776`	`caps = append((caps)[:i], (*caps)[i+1:]...)`
	`777`	`+ return`
`777`	`778`	`}`
`778`	`779`	`}`
`779`	`780`	`}`
Original file line number	Diff line number	Diff line change
`@@ -521,6 +521,9 @@ func (t *task) Update(ctx context.Context, opts ...UpdateTaskOpts) error {`
`521`	`521`	`}`
`522`	`522`
`523`	`523`	`func (t *task) LoadProcess(ctx context.Context, id string, ioAttach cio.Attach) (Process, error) {`
	`524`	`+ if id == t.id && ioAttach == nil {`
	`525`	`+ return t, nil`
	`526`	`+ }`
`524`	`527`	`response, err := t.client.TaskService().Get(ctx, &tasks.GetRequest{`
`525`	`528`	`ContainerID: t.id,`
`526`	`529`	`ExecID: id,`