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

Merge pull request #3117 from crosbymichael/exec-load

Browse Source 
Fastpath opt and ExecProcess loading
This commit is contained in:
Phil Estes 2019-03-22 13:20:51 -04:00 committed by GitHub
commit 8ea28ff564
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
oci/spec_opts.go
View File

@ -774,6 +774,7 @@ func removeCap(caps *[]string, s string) {
for i, c := range *caps { for i, c := range *caps {
if c == s { if c == s {
*caps = append((*caps)[:i], (*caps)[i+1:]...) *caps = append((*caps)[:i], (*caps)[i+1:]...)
return
} }
} }
} }

3
task.go
View File

@ -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) { 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{ response, err := t.client.TaskService().Get(ctx, &tasks.GetRequest{
ContainerID: t.id, ContainerID: t.id,
ExecID: id, ExecID: id,