Skip to content

Commit fe9d6a4

Browse files
authored
Merge pull request containerd#1525 from crosbymichael/shim-hang
Add wait API endpoint for waiting on process exit
2 parents 3273315 + d67763d commit fe9d6a4

File tree

23 files changed

+1314
-355
lines changed

23 files changed

+1314
-355
lines changed

api/next.pb.txt

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3576,6 +3576,45 @@ file {
35763576
json_name: "metrics"
35773577
}
35783578
}
3579+
message_type {
3580+
name: "WaitRequest"
3581+
field {
3582+
name: "container_id"
3583+
number: 1
3584+
label: LABEL_OPTIONAL
3585+
type: TYPE_STRING
3586+
json_name: "containerId"
3587+
}
3588+
field {
3589+
name: "exec_id"
3590+
number: 2
3591+
label: LABEL_OPTIONAL
3592+
type: TYPE_STRING
3593+
json_name: "execId"
3594+
}
3595+
}
3596+
message_type {
3597+
name: "WaitResponse"
3598+
field {
3599+
name: "exit_status"
3600+
number: 1
3601+
label: LABEL_OPTIONAL
3602+
type: TYPE_UINT32
3603+
json_name: "exitStatus"
3604+
}
3605+
field {
3606+
name: "exited_at"
3607+
number: 2
3608+
label: LABEL_OPTIONAL
3609+
type: TYPE_MESSAGE
3610+
type_name: ".google.protobuf.Timestamp"
3611+
options {
3612+
65010: 1
3613+
65001: 0
3614+
}
3615+
json_name: "exitedAt"
3616+
}
3617+
}
35793618
service {
35803619
name: "Tasks"
35813620
method {
@@ -3658,6 +3697,11 @@ file {
36583697
input_type: ".containerd.services.tasks.v1.MetricsRequest"
36593698
output_type: ".containerd.services.tasks.v1.MetricsResponse"
36603699
}
3700+
method {
3701+
name: "Wait"
3702+
input_type: ".containerd.services.tasks.v1.WaitRequest"
3703+
output_type: ".containerd.services.tasks.v1.WaitResponse"
3704+
}
36613705
}
36623706
options {
36633707
go_package: "github.com/containerd/containerd/api/services/tasks/v1;tasks"

0 commit comments

Comments
 (0)