Return exit status from Wait of stopped process
This changes Wait() from returning an error whenever you call wait on a stopped process/task to returning the exit status from the process. This also adds the exit status to the Status() call on a process/task so that a user can Wait(), check status, then cancel the wait to avoid races in event handling. Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
parent
0fa76584f8
commit
9f13b414b9
@ -43,6 +43,7 @@ const (
|
||||
StatusRunning Status = 2
|
||||
StatusStopped Status = 3
|
||||
StatusPaused Status = 4
|
||||
StatusPausing Status = 5
|
||||
)
|
||||
|
||||
var Status_name = map[int32]string{
|
||||
@ -51,6 +52,7 @@ var Status_name = map[int32]string{
|
||||
2: "RUNNING",
|
||||
3: "STOPPED",
|
||||
4: "PAUSED",
|
||||
5: "PAUSING",
|
||||
}
|
||||
var Status_value = map[string]int32{
|
||||
"UNKNOWN": 0,
|
||||
@ -58,6 +60,7 @@ var Status_value = map[string]int32{
|
||||
"RUNNING": 2,
|
||||
"STOPPED": 3,
|
||||
"PAUSED": 4,
|
||||
"PAUSING": 5,
|
||||
}
|
||||
|
||||
func (x Status) String() string {
|
||||
@ -74,6 +77,7 @@ type Process struct {
|
||||
Stdout string `protobuf:"bytes,6,opt,name=stdout,proto3" json:"stdout,omitempty"`
|
||||
Stderr string `protobuf:"bytes,7,opt,name=stderr,proto3" json:"stderr,omitempty"`
|
||||
Terminal bool `protobuf:"varint,8,opt,name=terminal,proto3" json:"terminal,omitempty"`
|
||||
ExitStatus uint32 `protobuf:"varint,9,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
|
||||
}
|
||||
|
||||
func (m *Process) Reset() { *m = Process{} }
|
||||
@ -149,6 +153,11 @@ func (m *Process) MarshalTo(dAtA []byte) (int, error) {
|
||||
}
|
||||
i++
|
||||
}
|
||||
if m.ExitStatus != 0 {
|
||||
dAtA[i] = 0x48
|
||||
i++
|
||||
i = encodeVarintTask(dAtA, i, uint64(m.ExitStatus))
|
||||
}
|
||||
return i, nil
|
||||
}
|
||||
|
||||
@ -211,6 +220,9 @@ func (m *Process) Size() (n int) {
|
||||
if m.Terminal {
|
||||
n += 2
|
||||
}
|
||||
if m.ExitStatus != 0 {
|
||||
n += 1 + sovTask(uint64(m.ExitStatus))
|
||||
}
|
||||
return n
|
||||
}
|
||||
|
||||
@ -240,6 +252,7 @@ func (this *Process) String() string {
|
||||
`Stdout:` + fmt.Sprintf("%v", this.Stdout) + `,`,
|
||||
`Stderr:` + fmt.Sprintf("%v", this.Stderr) + `,`,
|
||||
`Terminal:` + fmt.Sprintf("%v", this.Terminal) + `,`,
|
||||
`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
|
||||
`}`,
|
||||
}, "")
|
||||
return s
|
||||
@ -484,6 +497,25 @@ func (m *Process) Unmarshal(dAtA []byte) error {
|
||||
}
|
||||
}
|
||||
m.Terminal = bool(v != 0)
|
||||
case 9:
|
||||
if wireType != 0 {
|
||||
return fmt.Errorf("proto: wrong wireType = %d for field ExitStatus", wireType)
|
||||
}
|
||||
m.ExitStatus = 0
|
||||
for shift := uint(0); ; shift += 7 {
|
||||
if shift >= 64 {
|
||||
return ErrIntOverflowTask
|
||||
}
|
||||
if iNdEx >= l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
b := dAtA[iNdEx]
|
||||
iNdEx++
|
||||
m.ExitStatus |= (uint32(b) & 0x7F) << shift
|
||||
if b < 0x80 {
|
||||
break
|
||||
}
|
||||
}
|
||||
default:
|
||||
iNdEx = preIndex
|
||||
skippy, err := skipTask(dAtA[iNdEx:])
|
||||
@ -615,33 +647,34 @@ func init() {
|
||||
}
|
||||
|
||||
var fileDescriptorTask = []byte{
|
||||
// 436 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0x3f, 0x6f, 0xd3, 0x40,
|
||||
0x18, 0xc6, 0x73, 0x4e, 0xeb, 0x84, 0xeb, 0x1f, 0xcc, 0x51, 0x55, 0x87, 0x41, 0x57, 0x8b, 0x29,
|
||||
0x62, 0xb0, 0x45, 0xbb, 0xb1, 0xb5, 0x71, 0x84, 0x22, 0x24, 0xd7, 0xba, 0x34, 0x62, 0x44, 0x4e,
|
||||
0xee, 0x30, 0xa7, 0xb6, 0x77, 0xd6, 0xf9, 0x0c, 0xea, 0xc6, 0x88, 0xfa, 0x1d, 0x3a, 0xc1, 0x67,
|
||||
0x60, 0xe0, 0x13, 0x74, 0x64, 0x64, 0xaa, 0x88, 0x3f, 0x08, 0x42, 0x3e, 0x87, 0x90, 0xa1, 0x8b,
|
||||
0xf5, 0x3e, 0xcf, 0xef, 0xa7, 0xf7, 0xb5, 0x65, 0xf8, 0x2a, 0x17, 0xe6, 0x43, 0x35, 0x0b, 0xe7,
|
||||
0xea, 0x32, 0x9a, 0x2b, 0x69, 0x32, 0x21, 0xb9, 0x66, 0xeb, 0x63, 0x56, 0x88, 0xc8, 0x5c, 0x15,
|
||||
0xbc, 0x8c, 0x4c, 0x56, 0x9e, 0xdb, 0x47, 0x58, 0x68, 0x65, 0x14, 0x7a, 0xfc, 0xdf, 0x0a, 0x3f,
|
||||
0xbe, 0x0c, 0xad, 0xe4, 0xef, 0xe5, 0x2a, 0x57, 0x96, 0x47, 0xcd, 0xd4, 0xaa, 0xfe, 0x93, 0x5c,
|
||||
0xa9, 0xfc, 0x82, 0x47, 0x36, 0xcd, 0xaa, 0xf7, 0x51, 0x26, 0xaf, 0x5a, 0xf4, 0xfc, 0x0f, 0x80,
|
||||
0xbd, 0x54, 0xab, 0x39, 0x2f, 0x4b, 0x74, 0x08, 0xb7, 0x57, 0x3b, 0xdf, 0x09, 0x86, 0x41, 0x00,
|
||||
0x06, 0x0f, 0x4e, 0x1e, 0xd6, 0x77, 0x07, 0x5b, 0xc3, 0x7f, 0xfd, 0x38, 0xa6, 0x5b, 0x2b, 0x69,
|
||||
0xcc, 0xd0, 0x3e, 0x74, 0x04, 0xc3, 0x8e, 0x35, 0xdd, 0xfa, 0xee, 0xc0, 0x19, 0xc7, 0xd4, 0x11,
|
||||
0x0c, 0x79, 0xb0, 0x5b, 0x08, 0x86, 0xbb, 0x01, 0x18, 0xec, 0xd0, 0x66, 0x44, 0x47, 0xd0, 0x2d,
|
||||
0x4d, 0x66, 0xaa, 0x12, 0x6f, 0x04, 0x60, 0xb0, 0x7b, 0xf8, 0x34, 0xbc, 0xe7, 0x03, 0xc2, 0x89,
|
||||
0x55, 0xe8, 0x52, 0x45, 0x7b, 0x70, 0xb3, 0x34, 0x4c, 0x48, 0xbc, 0xd9, 0x5c, 0xa0, 0x6d, 0x40,
|
||||
0xfb, 0xcd, 0x2a, 0xa6, 0x2a, 0x83, 0x5d, 0x5b, 0x2f, 0xd3, 0xb2, 0xe7, 0x5a, 0xe3, 0xde, 0xaa,
|
||||
0xe7, 0x5a, 0x23, 0x1f, 0xf6, 0x0d, 0xd7, 0x97, 0x42, 0x66, 0x17, 0xb8, 0x1f, 0x80, 0x41, 0x9f,
|
||||
0xae, 0xf2, 0x8b, 0xef, 0x00, 0xba, 0xed, 0x51, 0x44, 0x60, 0x6f, 0x9a, 0xbc, 0x49, 0x4e, 0xdf,
|
||||
0x26, 0x5e, 0xc7, 0x7f, 0x74, 0x7d, 0x13, 0xec, 0xb4, 0x60, 0x2a, 0xcf, 0xa5, 0xfa, 0x24, 0x1b,
|
||||
0x3e, 0xa4, 0xa3, 0xe3, 0xb3, 0x51, 0xec, 0x81, 0x75, 0x3e, 0xd4, 0x3c, 0x33, 0x9c, 0x35, 0x9c,
|
||||
0x4e, 0x93, 0x64, 0x9c, 0xbc, 0xf6, 0x9c, 0x75, 0x4e, 0x2b, 0x29, 0x85, 0xcc, 0x1b, 0x3e, 0x39,
|
||||
0x3b, 0x4d, 0xd3, 0x51, 0xec, 0x75, 0xd7, 0xf9, 0xc4, 0xa8, 0xa2, 0xe0, 0x0c, 0x3d, 0x83, 0x6e,
|
||||
0x7a, 0x3c, 0x9d, 0x8c, 0x62, 0x6f, 0xc3, 0xf7, 0xae, 0x6f, 0x82, 0xed, 0x16, 0xa7, 0x59, 0x55,
|
||||
0x72, 0xe6, 0xef, 0x7e, 0xf9, 0x4a, 0x3a, 0x3f, 0xbe, 0x91, 0xe5, 0xdb, 0x9e, 0xe0, 0xdb, 0x05,
|
||||
0xe9, 0xfc, 0x5a, 0x90, 0xce, 0xe7, 0x9a, 0x80, 0xdb, 0x9a, 0x80, 0x9f, 0x35, 0x01, 0xbf, 0x6b,
|
||||
0x02, 0x66, 0xae, 0xfd, 0xb5, 0x47, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x2d, 0x82, 0xe5, 0xdf,
|
||||
0x5e, 0x02, 0x00, 0x00,
|
||||
// 462 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0xb1, 0x6e, 0xd3, 0x40,
|
||||
0x1c, 0xc6, 0x73, 0x4e, 0xe3, 0xa4, 0x97, 0xb6, 0x98, 0xa3, 0xaa, 0x8c, 0x41, 0x8e, 0xc5, 0x14,
|
||||
0x31, 0xd8, 0xa2, 0xdd, 0xd8, 0xda, 0x38, 0x42, 0x11, 0x92, 0x6b, 0x39, 0x8d, 0x18, 0x2b, 0x27,
|
||||
0x77, 0x98, 0x53, 0xdb, 0x3b, 0xeb, 0x7c, 0x06, 0xba, 0x31, 0xa2, 0xbe, 0x43, 0xc5, 0x00, 0x4f,
|
||||
0xc1, 0x13, 0x74, 0x64, 0x42, 0x4c, 0x15, 0xf1, 0x93, 0xa0, 0x3b, 0x9b, 0xe0, 0x81, 0xc5, 0xfa,
|
||||
0x7f, 0xdf, 0xef, 0xf3, 0xe7, 0xff, 0x5f, 0x32, 0x7c, 0x99, 0x51, 0xf9, 0xae, 0x5c, 0xfa, 0x2b,
|
||||
0x7e, 0x15, 0xac, 0x38, 0x93, 0x29, 0x65, 0x44, 0xe0, 0xf6, 0x98, 0xe6, 0x34, 0x90, 0xd7, 0x39,
|
||||
0x29, 0x02, 0x99, 0x16, 0x17, 0xfa, 0xe1, 0xe7, 0x82, 0x4b, 0x8e, 0x1e, 0xfd, 0x4b, 0xf9, 0xef,
|
||||
0x5f, 0xf8, 0x3a, 0xe4, 0xec, 0x67, 0x3c, 0xe3, 0x9a, 0x07, 0x6a, 0xaa, 0xa3, 0xce, 0xe3, 0x8c,
|
||||
0xf3, 0xec, 0x92, 0x04, 0x5a, 0x2d, 0xcb, 0xb7, 0x41, 0xca, 0xae, 0x6b, 0xf4, 0xec, 0x8b, 0x01,
|
||||
0xfb, 0xb1, 0xe0, 0x2b, 0x52, 0x14, 0xe8, 0x10, 0xee, 0x6c, 0x3a, 0xcf, 0x29, 0xb6, 0x81, 0x07,
|
||||
0xc6, 0xdb, 0x27, 0x0f, 0xaa, 0xfb, 0xd1, 0x70, 0xf2, 0xd7, 0x9f, 0x85, 0xc9, 0x70, 0x13, 0x9a,
|
||||
0x61, 0x74, 0x00, 0x0d, 0x8a, 0x6d, 0x43, 0x27, 0xcd, 0xea, 0x7e, 0x64, 0xcc, 0xc2, 0xc4, 0xa0,
|
||||
0x18, 0x59, 0xb0, 0x9b, 0x53, 0x6c, 0x77, 0x3d, 0x30, 0xde, 0x4d, 0xd4, 0x88, 0x8e, 0xa0, 0x59,
|
||||
0xc8, 0x54, 0x96, 0x85, 0xbd, 0xe5, 0x81, 0xf1, 0xde, 0xe1, 0x13, 0xff, 0x3f, 0x07, 0xf8, 0x73,
|
||||
0x1d, 0x49, 0x9a, 0x28, 0xda, 0x87, 0xbd, 0x42, 0x62, 0xca, 0xec, 0x9e, 0xfa, 0x42, 0x52, 0x0b,
|
||||
0x74, 0xa0, 0xaa, 0x30, 0x2f, 0xa5, 0x6d, 0x6a, 0xbb, 0x51, 0x8d, 0x4f, 0x84, 0xb0, 0xfb, 0x1b,
|
||||
0x9f, 0x08, 0x81, 0x1c, 0x38, 0x90, 0x44, 0x5c, 0x51, 0x96, 0x5e, 0xda, 0x03, 0x0f, 0x8c, 0x07,
|
||||
0xc9, 0x46, 0xa3, 0x11, 0x1c, 0x92, 0x8f, 0x54, 0x9e, 0x37, 0xbb, 0x6d, 0xeb, 0x85, 0xa1, 0xb2,
|
||||
0xea, 0x55, 0x9e, 0xff, 0x04, 0xd0, 0xac, 0x47, 0xe4, 0xc2, 0xfe, 0x22, 0x7a, 0x1d, 0x9d, 0xbe,
|
||||
0x89, 0xac, 0x8e, 0xf3, 0xf0, 0xe6, 0xd6, 0xdb, 0xad, 0xc1, 0x82, 0x5d, 0x30, 0xfe, 0x81, 0x29,
|
||||
0x3e, 0x49, 0xa6, 0xc7, 0x67, 0xd3, 0xd0, 0x02, 0x6d, 0x3e, 0x11, 0x24, 0x95, 0x04, 0x2b, 0x9e,
|
||||
0x2c, 0xa2, 0x68, 0x16, 0xbd, 0xb2, 0x8c, 0x36, 0x4f, 0x4a, 0xc6, 0x28, 0xcb, 0x14, 0x9f, 0x9f,
|
||||
0x9d, 0xc6, 0xf1, 0x34, 0xb4, 0xba, 0x6d, 0x3e, 0x97, 0x3c, 0xcf, 0x09, 0x46, 0x4f, 0xa1, 0x19,
|
||||
0x1f, 0x2f, 0xe6, 0xd3, 0xd0, 0xda, 0x72, 0xac, 0x9b, 0x5b, 0x6f, 0xa7, 0xc6, 0x71, 0x5a, 0x16,
|
||||
0x75, 0xbb, 0xa2, 0xaa, 0xbd, 0xd7, 0x7e, 0x5b, 0x61, 0xca, 0x32, 0x67, 0xef, 0xf3, 0x57, 0xb7,
|
||||
0xf3, 0xfd, 0x9b, 0xdb, 0x5c, 0x73, 0x62, 0xdf, 0xad, 0xdd, 0xce, 0xaf, 0xb5, 0xdb, 0xf9, 0x54,
|
||||
0xb9, 0xe0, 0xae, 0x72, 0xc1, 0x8f, 0xca, 0x05, 0xbf, 0x2b, 0x17, 0x2c, 0x4d, 0xfd, 0x6f, 0x1c,
|
||||
0xfd, 0x09, 0x00, 0x00, 0xff, 0xff, 0x22, 0xfa, 0xb5, 0x46, 0x9f, 0x02, 0x00, 0x00,
|
||||
}
|
||||
|
||||
@ -14,6 +14,7 @@ enum Status {
|
||||
RUNNING = 2 [(gogoproto.enumvalue_customname) = "StatusRunning"];
|
||||
STOPPED = 3 [(gogoproto.enumvalue_customname) = "StatusStopped"];
|
||||
PAUSED = 4 [(gogoproto.enumvalue_customname) = "StatusPaused"];
|
||||
PAUSING = 5 [(gogoproto.enumvalue_customname) = "StatusPausing"];
|
||||
}
|
||||
|
||||
message Process {
|
||||
@ -25,4 +26,5 @@ message Process {
|
||||
string stdout = 6;
|
||||
string stderr = 7;
|
||||
bool terminal = 8;
|
||||
uint32 exit_status = 9;
|
||||
}
|
||||
|
||||
@ -264,7 +264,7 @@ func TestCheckpointLeaveRunning(t *testing.T) {
|
||||
t.Error(err)
|
||||
return
|
||||
}
|
||||
if status != Running {
|
||||
if status.Status != Running {
|
||||
t.Errorf("expected status %q but received %q", Running, status)
|
||||
return
|
||||
}
|
||||
|
||||
@ -59,7 +59,7 @@ func deleteContainer(ctx context.Context, client *containerd.Client, id string,
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if status == containerd.Stopped || status == containerd.Created {
|
||||
if status.Status == containerd.Stopped || status.Status == containerd.Created {
|
||||
if _, err := task.Delete(ctx); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@ -1028,13 +1028,13 @@ func TestWaitStoppedTask(t *testing.T) {
|
||||
}
|
||||
// wait for the task to stop then call wait again
|
||||
<-statusC
|
||||
_, err = task.Wait(ctx)
|
||||
if err == nil {
|
||||
t.Error("Wait after task exits should return an error")
|
||||
status, err := task.Wait(ctx)
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
return
|
||||
}
|
||||
if !errdefs.IsUnavailable(err) {
|
||||
t.Errorf("Wait should return %q when task Stopped: %v", errdefs.ErrUnavailable, err)
|
||||
if status != 7 {
|
||||
t.Errorf("exit status from stopped task should be 7 but received %d", status)
|
||||
}
|
||||
}
|
||||
|
||||
@ -1119,13 +1119,13 @@ func TestWaitStoppedProcess(t *testing.T) {
|
||||
// wait for the exec to return
|
||||
<-processStatusC
|
||||
// try to wait on the process after it has stopped
|
||||
_, err = process.Wait(ctx)
|
||||
if err == nil {
|
||||
t.Error("Wait after process exits should return an error")
|
||||
status, err := process.Wait(ctx)
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
return
|
||||
}
|
||||
if !errdefs.IsUnavailable(err) {
|
||||
t.Errorf("Wait should return %q when process has exited: %v", errdefs.ErrUnavailable, err)
|
||||
if status != 6 {
|
||||
t.Errorf("exit status from stopped process should be 6 but received %d", status)
|
||||
}
|
||||
if err := task.Kill(ctx, syscall.SIGKILL); err != nil {
|
||||
t.Error(err)
|
||||
|
||||
@ -49,7 +49,8 @@ func (p *Process) State(ctx context.Context) (runtime.State, error) {
|
||||
status = runtime.StoppedStatus
|
||||
case task.StatusPaused:
|
||||
status = runtime.PausedStatus
|
||||
// TODO: containerd.DeletedStatus
|
||||
case task.StatusPausing:
|
||||
status = runtime.PausingStatus
|
||||
}
|
||||
return runtime.State{
|
||||
Pid: response.Pid,
|
||||
@ -58,6 +59,7 @@ func (p *Process) State(ctx context.Context) (runtime.State, error) {
|
||||
Stdout: response.Stdout,
|
||||
Stderr: response.Stderr,
|
||||
Terminal: response.Terminal,
|
||||
ExitStatus: response.ExitStatus,
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
||||
@ -247,6 +247,8 @@ func (s *Service) State(ctx context.Context, r *shimapi.StateRequest) (*shimapi.
|
||||
status = task.StatusStopped
|
||||
case "paused":
|
||||
status = task.StatusPaused
|
||||
case "pausing":
|
||||
status = task.StatusPausing
|
||||
}
|
||||
sio := p.Stdio()
|
||||
return &shimapi.StateResponse{
|
||||
@ -258,6 +260,7 @@ func (s *Service) State(ctx context.Context, r *shimapi.StateRequest) (*shimapi.
|
||||
Stdout: sio.stdout,
|
||||
Stderr: sio.stderr,
|
||||
Terminal: sio.terminal,
|
||||
ExitStatus: uint32(p.ExitStatus()),
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
||||
@ -157,6 +157,7 @@ type StateResponse struct {
|
||||
Stdout string `protobuf:"bytes,6,opt,name=stdout,proto3" json:"stdout,omitempty"`
|
||||
Stderr string `protobuf:"bytes,7,opt,name=stderr,proto3" json:"stderr,omitempty"`
|
||||
Terminal bool `protobuf:"varint,8,opt,name=terminal,proto3" json:"terminal,omitempty"`
|
||||
ExitStatus uint32 `protobuf:"varint,9,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
|
||||
}
|
||||
|
||||
func (m *StateResponse) Reset() { *m = StateResponse{} }
|
||||
@ -1183,6 +1184,11 @@ func (m *StateResponse) MarshalTo(dAtA []byte) (int, error) {
|
||||
}
|
||||
i++
|
||||
}
|
||||
if m.ExitStatus != 0 {
|
||||
dAtA[i] = 0x48
|
||||
i++
|
||||
i = encodeVarintShim(dAtA, i, uint64(m.ExitStatus))
|
||||
}
|
||||
return i, nil
|
||||
}
|
||||
|
||||
@ -1660,6 +1666,9 @@ func (m *StateResponse) Size() (n int) {
|
||||
if m.Terminal {
|
||||
n += 2
|
||||
}
|
||||
if m.ExitStatus != 0 {
|
||||
n += 1 + sovShim(uint64(m.ExitStatus))
|
||||
}
|
||||
return n
|
||||
}
|
||||
|
||||
@ -1895,6 +1904,7 @@ func (this *StateResponse) String() string {
|
||||
`Stdout:` + fmt.Sprintf("%v", this.Stdout) + `,`,
|
||||
`Stderr:` + fmt.Sprintf("%v", this.Stderr) + `,`,
|
||||
`Terminal:` + fmt.Sprintf("%v", this.Terminal) + `,`,
|
||||
`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
|
||||
`}`,
|
||||
}, "")
|
||||
return s
|
||||
@ -3331,6 +3341,25 @@ func (m *StateResponse) Unmarshal(dAtA []byte) error {
|
||||
}
|
||||
}
|
||||
m.Terminal = bool(v != 0)
|
||||
case 9:
|
||||
if wireType != 0 {
|
||||
return fmt.Errorf("proto: wrong wireType = %d for field ExitStatus", wireType)
|
||||
}
|
||||
m.ExitStatus = 0
|
||||
for shift := uint(0); ; shift += 7 {
|
||||
if shift >= 64 {
|
||||
return ErrIntOverflowShim
|
||||
}
|
||||
if iNdEx >= l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
b := dAtA[iNdEx]
|
||||
iNdEx++
|
||||
m.ExitStatus |= (uint32(b) & 0x7F) << shift
|
||||
if b < 0x80 {
|
||||
break
|
||||
}
|
||||
}
|
||||
default:
|
||||
iNdEx = preIndex
|
||||
skippy, err := skipShim(dAtA[iNdEx:])
|
||||
@ -4311,72 +4340,73 @@ func init() {
|
||||
}
|
||||
|
||||
var fileDescriptorShim = []byte{
|
||||
// 1072 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0x5f, 0x6f, 0xe3, 0x44,
|
||||
0x10, 0xaf, 0xf3, 0xbf, 0x13, 0x52, 0xda, 0xa5, 0x57, 0x7c, 0x39, 0x29, 0x8d, 0xfc, 0x50, 0x05,
|
||||
0xa1, 0x73, 0x68, 0x8a, 0xee, 0x38, 0x90, 0x90, 0xda, 0xde, 0x09, 0x55, 0x50, 0x5d, 0xe5, 0xf6,
|
||||
0x00, 0x81, 0x50, 0xe5, 0xc6, 0xdb, 0x64, 0xd5, 0xc4, 0xeb, 0xf3, 0xae, 0x4b, 0xcb, 0x13, 0x4f,
|
||||
0x3c, 0xf3, 0x71, 0xf8, 0x08, 0x7d, 0xe4, 0x91, 0xa7, 0x83, 0x8b, 0x84, 0xc4, 0x0b, 0xdf, 0x01,
|
||||
0xed, 0x9f, 0x24, 0x4e, 0x52, 0xcb, 0x0e, 0x2f, 0xcd, 0xce, 0xee, 0x6f, 0x66, 0x67, 0xe6, 0x37,
|
||||
0x3b, 0xe3, 0xc2, 0xb3, 0x1e, 0xe1, 0xfd, 0xe8, 0xc2, 0xee, 0xd2, 0x61, 0xbb, 0x4b, 0x7d, 0xee,
|
||||
0x12, 0x1f, 0x87, 0x5e, 0x7c, 0x39, 0x20, 0x7e, 0x74, 0xd3, 0x66, 0x7d, 0x32, 0x6c, 0x5f, 0xef,
|
||||
0xca, 0x5f, 0x3b, 0x08, 0x29, 0xa7, 0xa8, 0x39, 0x05, 0xd9, 0x61, 0xe4, 0x73, 0x32, 0xc4, 0xb6,
|
||||
0x04, 0xdb, 0x12, 0x74, 0xbd, 0x5b, 0x7f, 0xd8, 0xa3, 0xb4, 0x37, 0xc0, 0x6d, 0x89, 0xbf, 0x88,
|
||||
0x2e, 0xdb, 0xae, 0x7f, 0xab, 0x94, 0xeb, 0x8f, 0xe6, 0x8f, 0xf0, 0x30, 0xe0, 0xe3, 0xc3, 0xcd,
|
||||
0x1e, 0xed, 0x51, 0xb9, 0x6c, 0x8b, 0x95, 0xde, 0xdd, 0x9e, 0x57, 0x11, 0x37, 0x32, 0xee, 0x0e,
|
||||
0x03, 0x0d, 0x78, 0x92, 0x1a, 0x8b, 0x1b, 0x90, 0x36, 0xbf, 0x0d, 0x30, 0x6b, 0x0f, 0x69, 0xe4,
|
||||
0x73, 0xad, 0xf7, 0xe9, 0x12, 0x7a, 0xdc, 0x65, 0x57, 0xf2, 0x8f, 0xd2, 0xb5, 0xfe, 0xcd, 0xc1,
|
||||
0xc6, 0x61, 0x88, 0x5d, 0x8e, 0xcf, 0x5c, 0x76, 0xe5, 0xe0, 0xd7, 0x11, 0x66, 0x1c, 0x6d, 0x41,
|
||||
0x8e, 0x78, 0xa6, 0xd1, 0x34, 0x5a, 0xab, 0x07, 0xa5, 0xd1, 0x9b, 0xed, 0xdc, 0xd1, 0x73, 0x27,
|
||||
0x47, 0x3c, 0xb4, 0x05, 0xa5, 0x8b, 0xc8, 0xf7, 0x06, 0xd8, 0xcc, 0x89, 0x33, 0x47, 0x4b, 0xc8,
|
||||
0x84, 0xb2, 0xce, 0xa0, 0x99, 0x97, 0x07, 0x63, 0x11, 0xb5, 0xa1, 0x14, 0x52, 0xca, 0x2f, 0x99,
|
||||
0x59, 0x68, 0xe6, 0x5b, 0xd5, 0xce, 0xfb, 0x76, 0x2c, 0xeb, 0xd2, 0x25, 0xfb, 0x58, 0x84, 0xe2,
|
||||
0x68, 0x18, 0xaa, 0x43, 0x85, 0xe3, 0x70, 0x48, 0x7c, 0x77, 0x60, 0x16, 0x9b, 0x46, 0xab, 0xe2,
|
||||
0x4c, 0x64, 0xb4, 0x09, 0x45, 0xc6, 0x3d, 0xe2, 0x9b, 0x25, 0x79, 0x89, 0x12, 0x84, 0x53, 0x8c,
|
||||
0x7b, 0x34, 0xe2, 0x66, 0x59, 0x39, 0xa5, 0x24, 0xbd, 0x8f, 0xc3, 0xd0, 0xac, 0x4c, 0xf6, 0x71,
|
||||
0x18, 0xa2, 0x06, 0x40, 0xb7, 0x8f, 0xbb, 0x57, 0x01, 0x25, 0x3e, 0x37, 0x57, 0xe5, 0x59, 0x6c,
|
||||
0x07, 0x7d, 0x08, 0x1b, 0x81, 0x1b, 0x62, 0x9f, 0x9f, 0xc7, 0x60, 0x20, 0x61, 0xeb, 0xea, 0xe0,
|
||||
0x70, 0x0a, 0xb6, 0xa1, 0x4c, 0x03, 0x4e, 0xa8, 0xcf, 0xcc, 0x6a, 0xd3, 0x68, 0x55, 0x3b, 0x9b,
|
||||
0xb6, 0xa2, 0xd9, 0x1e, 0xd3, 0x6c, 0xef, 0xfb, 0xb7, 0xce, 0x18, 0x64, 0xed, 0x00, 0x8a, 0xa7,
|
||||
0x9b, 0x05, 0xd4, 0x67, 0x18, 0xad, 0x43, 0x3e, 0xd0, 0x09, 0xaf, 0x39, 0x62, 0x69, 0xfd, 0x62,
|
||||
0xc0, 0xda, 0x73, 0x3c, 0xc0, 0x1c, 0x27, 0x83, 0xd0, 0x36, 0x54, 0xf1, 0x0d, 0xe1, 0xe7, 0x8c,
|
||||
0xbb, 0x3c, 0x62, 0x92, 0x93, 0x9a, 0x03, 0x62, 0xeb, 0x54, 0xee, 0xa0, 0x7d, 0x58, 0x15, 0x12,
|
||||
0xf6, 0xce, 0x5d, 0x2e, 0x99, 0xa9, 0x76, 0xea, 0x0b, 0xfe, 0x9d, 0x8d, 0xcb, 0xf0, 0xa0, 0x72,
|
||||
0xf7, 0x66, 0x7b, 0xe5, 0xd7, 0x3f, 0xb7, 0x0d, 0xa7, 0xa2, 0xd4, 0xf6, 0xb9, 0x65, 0xc3, 0xa6,
|
||||
0xf2, 0xe3, 0x24, 0xa4, 0x5d, 0xcc, 0x58, 0x4a, 0x89, 0x58, 0xbf, 0x19, 0x80, 0x5e, 0xdc, 0xe0,
|
||||
0x6e, 0x36, 0xf8, 0x0c, 0xdd, 0xb9, 0x24, 0xba, 0xf3, 0xf7, 0xd3, 0x5d, 0x48, 0xa0, 0xbb, 0x38,
|
||||
0x43, 0x77, 0x0b, 0x0a, 0x2c, 0xc0, 0x5d, 0x59, 0x33, 0x49, 0xf4, 0x48, 0x84, 0xf5, 0x00, 0xde,
|
||||
0x9b, 0xf1, 0x5c, 0xe5, 0xdd, 0xfa, 0x16, 0xd6, 0x1d, 0xcc, 0xc8, 0x4f, 0xf8, 0x84, 0xdf, 0xa6,
|
||||
0x85, 0xb3, 0x09, 0xc5, 0x1f, 0x89, 0xc7, 0xfb, 0x9a, 0x0b, 0x25, 0x08, 0xd7, 0xfa, 0x98, 0xf4,
|
||||
0xfa, 0x8a, 0x83, 0x9a, 0xa3, 0x25, 0x6b, 0x07, 0xde, 0x11, 0x44, 0xe1, 0xb4, 0x9c, 0xfe, 0x63,
|
||||
0x40, 0x4d, 0x03, 0x75, 0x2d, 0x2c, 0xfb, 0x40, 0x75, 0xed, 0xe4, 0xa7, 0xb5, 0xb3, 0x27, 0xd2,
|
||||
0x25, 0xcb, 0x46, 0xa4, 0x71, 0xad, 0xf3, 0x28, 0xfe, 0x30, 0xaf, 0x77, 0xf5, 0xdb, 0x54, 0x75,
|
||||
0xe4, 0x68, 0xe8, 0x94, 0x91, 0xe2, 0xfd, 0x8c, 0x94, 0x12, 0x18, 0x29, 0xcf, 0x30, 0x12, 0xe7,
|
||||
0xbc, 0x32, 0xcb, 0xb9, 0xf5, 0x12, 0xaa, 0x5f, 0x92, 0xc1, 0x20, 0x43, 0x23, 0x62, 0xa4, 0x37,
|
||||
0x2e, 0x9a, 0x9a, 0xa3, 0x25, 0x11, 0xa7, 0x3b, 0x18, 0xc8, 0x38, 0x2b, 0x8e, 0x58, 0x5a, 0x9f,
|
||||
0xc3, 0xda, 0xe1, 0x80, 0x32, 0x7c, 0xf4, 0x32, 0x03, 0x77, 0x2a, 0x38, 0x55, 0x87, 0x4a, 0xb0,
|
||||
0x3e, 0x80, 0x77, 0xbf, 0x22, 0x8c, 0x9f, 0x10, 0x2f, 0xb5, 0xf4, 0x77, 0x60, 0x7d, 0x0a, 0xd5,
|
||||
0x44, 0x21, 0x28, 0x04, 0xc4, 0x63, 0xa6, 0xd1, 0xcc, 0xb7, 0x6a, 0x8e, 0x5c, 0x5b, 0xdf, 0xc3,
|
||||
0x83, 0x69, 0x07, 0x89, 0xb7, 0x5d, 0x01, 0x76, 0x79, 0x5f, 0x99, 0x76, 0xe4, 0x3a, 0xde, 0x60,
|
||||
0x72, 0x59, 0x1a, 0xcc, 0x63, 0x58, 0x3f, 0xed, 0x93, 0xe1, 0x91, 0x7f, 0x49, 0x27, 0x4e, 0x3c,
|
||||
0x84, 0x8a, 0x18, 0x69, 0xe7, 0xd3, 0xf6, 0x51, 0x16, 0xf2, 0x09, 0xf1, 0xac, 0x2f, 0x60, 0xe3,
|
||||
0x55, 0xe0, 0xcd, 0xb5, 0xff, 0x0e, 0xac, 0x86, 0x98, 0xd1, 0x28, 0xec, 0x62, 0x26, 0x15, 0x92,
|
||||
0x6e, 0x9d, 0xc2, 0x74, 0x2d, 0x87, 0x3c, 0x2d, 0x49, 0xcf, 0x64, 0x29, 0x0b, 0x5c, 0x4a, 0x29,
|
||||
0xeb, 0x92, 0xcd, 0x4d, 0x4a, 0xb6, 0xf3, 0x37, 0x40, 0x41, 0xc4, 0x86, 0xfa, 0x50, 0x94, 0xcf,
|
||||
0x01, 0xd9, 0x76, 0xda, 0x0c, 0xb7, 0xe3, 0x0f, 0xac, 0xde, 0xce, 0x8c, 0xd7, 0xce, 0x31, 0x28,
|
||||
0xa9, 0x76, 0x8d, 0xf6, 0xd2, 0x55, 0x17, 0xe6, 0x68, 0xfd, 0xe3, 0xe5, 0x94, 0xf4, 0xa5, 0x2a,
|
||||
0xbc, 0x90, 0x67, 0x0c, 0x6f, 0x92, 0xf3, 0x8c, 0xe1, 0xc5, 0x72, 0xef, 0x40, 0x49, 0x35, 0x77,
|
||||
0xb4, 0xb5, 0xc0, 0xef, 0x0b, 0xf1, 0x41, 0x53, 0xff, 0x28, 0xdd, 0xe4, 0xdc, 0x98, 0xba, 0x85,
|
||||
0xda, 0xcc, 0xc0, 0x40, 0x4f, 0xb2, 0x9a, 0x98, 0x1d, 0x19, 0xff, 0xe3, 0xea, 0xd7, 0x50, 0x19,
|
||||
0x3f, 0x40, 0xb4, 0x9b, 0xae, 0x3d, 0xf7, 0xae, 0xeb, 0x9d, 0x65, 0x54, 0xf4, 0x95, 0x4f, 0xa1,
|
||||
0x78, 0xe2, 0x46, 0x2c, 0x39, 0x81, 0x09, 0xfb, 0xe8, 0x13, 0x28, 0x39, 0x98, 0x45, 0xc3, 0xe5,
|
||||
0x35, 0x7f, 0x00, 0x88, 0x7d, 0x80, 0x3c, 0xcd, 0x50, 0x62, 0xf7, 0x35, 0x9b, 0x44, 0xf3, 0xc7,
|
||||
0x50, 0x10, 0x1d, 0x18, 0x3d, 0x4e, 0x37, 0x1c, 0xeb, 0xd4, 0x89, 0xe6, 0xce, 0xa0, 0x20, 0x86,
|
||||
0x2a, 0xca, 0xf0, 0x14, 0x16, 0x3f, 0x1b, 0x12, 0xad, 0x7e, 0x03, 0xab, 0x93, 0x99, 0x8c, 0x32,
|
||||
0xf0, 0x36, 0x3f, 0xc0, 0x13, 0x0d, 0x9f, 0x42, 0x59, 0x8f, 0x0b, 0x94, 0xa1, 0xfe, 0x66, 0x27,
|
||||
0x4b, 0xa2, 0xd1, 0xaf, 0xa1, 0x32, 0xee, 0xc9, 0x89, 0x6c, 0x67, 0x08, 0x62, 0xa1, 0xaf, 0xbf,
|
||||
0x82, 0x92, 0x6a, 0xde, 0x59, 0xba, 0xd3, 0x42, 0x9b, 0x4f, 0x72, 0xf7, 0xe0, 0xf8, 0xee, 0x6d,
|
||||
0x63, 0xe5, 0x8f, 0xb7, 0x8d, 0x95, 0x9f, 0x47, 0x0d, 0xe3, 0x6e, 0xd4, 0x30, 0x7e, 0x1f, 0x35,
|
||||
0x8c, 0xbf, 0x46, 0x0d, 0xe3, 0xbb, 0xbd, 0xe5, 0xfe, 0xdb, 0xfa, 0x4c, 0xfc, 0x5e, 0x94, 0xa4,
|
||||
0xf9, 0xbd, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x05, 0x95, 0x8a, 0x43, 0xab, 0x0d, 0x00, 0x00,
|
||||
// 1078 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0x4f, 0x6f, 0xe3, 0x44,
|
||||
0x14, 0xaf, 0xf3, 0x3f, 0x2f, 0xa4, 0xb4, 0x43, 0xb7, 0x78, 0xb3, 0x52, 0x1a, 0xf9, 0x50, 0x05,
|
||||
0xa1, 0x75, 0x68, 0x8a, 0x76, 0x59, 0x90, 0x90, 0xda, 0xee, 0x0a, 0x55, 0x50, 0x6d, 0xe5, 0x76,
|
||||
0x01, 0x81, 0x50, 0xe5, 0xc6, 0xd3, 0x64, 0xd4, 0xc4, 0xe3, 0xf5, 0x8c, 0x4b, 0xcb, 0x89, 0x13,
|
||||
0x12, 0x37, 0x3e, 0x0e, 0x1f, 0xa1, 0x47, 0x8e, 0x9c, 0x16, 0xb6, 0x12, 0x47, 0xbe, 0x03, 0x9a,
|
||||
0x3f, 0x49, 0x9c, 0xa4, 0x96, 0x1d, 0x2e, 0xcd, 0xbc, 0x99, 0xdf, 0x9b, 0x79, 0xf3, 0x7e, 0xbf,
|
||||
0x79, 0xcf, 0x85, 0x67, 0x7d, 0xc2, 0x07, 0xd1, 0xb9, 0xdd, 0xa3, 0xa3, 0x4e, 0x8f, 0xfa, 0xdc,
|
||||
0x25, 0x3e, 0x0e, 0xbd, 0xf8, 0x70, 0x48, 0xfc, 0xe8, 0xba, 0xc3, 0x06, 0x64, 0xd4, 0xb9, 0xda,
|
||||
0x91, 0xbf, 0x76, 0x10, 0x52, 0x4e, 0x51, 0x6b, 0x0a, 0xb2, 0xc3, 0xc8, 0xe7, 0x64, 0x84, 0x6d,
|
||||
0x09, 0xb6, 0x25, 0xe8, 0x6a, 0xa7, 0xf1, 0xb0, 0x4f, 0x69, 0x7f, 0x88, 0x3b, 0x12, 0x7f, 0x1e,
|
||||
0x5d, 0x74, 0x5c, 0xff, 0x46, 0x39, 0x37, 0x1e, 0xcd, 0x2f, 0xe1, 0x51, 0xc0, 0xc7, 0x8b, 0x1b,
|
||||
0x7d, 0xda, 0xa7, 0x72, 0xd8, 0x11, 0x23, 0x3d, 0xbb, 0x35, 0xef, 0x22, 0x4e, 0x64, 0xdc, 0x1d,
|
||||
0x05, 0x1a, 0xf0, 0x24, 0xf5, 0x2e, 0x6e, 0x40, 0x3a, 0xfc, 0x26, 0xc0, 0xac, 0x33, 0xa2, 0x91,
|
||||
0xcf, 0xb5, 0xdf, 0xa7, 0x4b, 0xf8, 0x71, 0x97, 0x5d, 0xca, 0x3f, 0xca, 0xd7, 0xfa, 0x37, 0x07,
|
||||
0xeb, 0x07, 0x21, 0x76, 0x39, 0x3e, 0x75, 0xd9, 0xa5, 0x83, 0x5f, 0x47, 0x98, 0x71, 0xb4, 0x09,
|
||||
0x39, 0xe2, 0x99, 0x46, 0xcb, 0x68, 0x57, 0xf7, 0x4b, 0x77, 0x6f, 0xb6, 0x72, 0x87, 0xcf, 0x9d,
|
||||
0x1c, 0xf1, 0xd0, 0x26, 0x94, 0xce, 0x23, 0xdf, 0x1b, 0x62, 0x33, 0x27, 0xd6, 0x1c, 0x6d, 0x21,
|
||||
0x13, 0xca, 0x3a, 0x83, 0x66, 0x5e, 0x2e, 0x8c, 0x4d, 0xd4, 0x81, 0x52, 0x48, 0x29, 0xbf, 0x60,
|
||||
0x66, 0xa1, 0x95, 0x6f, 0xd7, 0xba, 0xef, 0xdb, 0xb1, 0xac, 0xcb, 0x90, 0xec, 0x23, 0x71, 0x15,
|
||||
0x47, 0xc3, 0x50, 0x03, 0x2a, 0x1c, 0x87, 0x23, 0xe2, 0xbb, 0x43, 0xb3, 0xd8, 0x32, 0xda, 0x15,
|
||||
0x67, 0x62, 0xa3, 0x0d, 0x28, 0x32, 0xee, 0x11, 0xdf, 0x2c, 0xc9, 0x43, 0x94, 0x21, 0x82, 0x62,
|
||||
0xdc, 0xa3, 0x11, 0x37, 0xcb, 0x2a, 0x28, 0x65, 0xe9, 0x79, 0x1c, 0x86, 0x66, 0x65, 0x32, 0x8f,
|
||||
0xc3, 0x10, 0x35, 0x01, 0x7a, 0x03, 0xdc, 0xbb, 0x0c, 0x28, 0xf1, 0xb9, 0x59, 0x95, 0x6b, 0xb1,
|
||||
0x19, 0xf4, 0x21, 0xac, 0x07, 0x6e, 0x88, 0x7d, 0x7e, 0x16, 0x83, 0x81, 0x84, 0xad, 0xa9, 0x85,
|
||||
0x83, 0x29, 0xd8, 0x86, 0x32, 0x0d, 0x38, 0xa1, 0x3e, 0x33, 0x6b, 0x2d, 0xa3, 0x5d, 0xeb, 0x6e,
|
||||
0xd8, 0x8a, 0x66, 0x7b, 0x4c, 0xb3, 0xbd, 0xe7, 0xdf, 0x38, 0x63, 0x90, 0xb5, 0x0d, 0x28, 0x9e,
|
||||
0x6e, 0x16, 0x50, 0x9f, 0x61, 0xb4, 0x06, 0xf9, 0x40, 0x27, 0xbc, 0xee, 0x88, 0xa1, 0xf5, 0x8b,
|
||||
0x01, 0xab, 0xcf, 0xf1, 0x10, 0x73, 0x9c, 0x0c, 0x42, 0x5b, 0x50, 0xc3, 0xd7, 0x84, 0x9f, 0x31,
|
||||
0xee, 0xf2, 0x88, 0x49, 0x4e, 0xea, 0x0e, 0x88, 0xa9, 0x13, 0x39, 0x83, 0xf6, 0xa0, 0x2a, 0x2c,
|
||||
0xec, 0x9d, 0xb9, 0x5c, 0x32, 0x53, 0xeb, 0x36, 0x16, 0xe2, 0x3b, 0x1d, 0xcb, 0x70, 0xbf, 0x72,
|
||||
0xfb, 0x66, 0x6b, 0xe5, 0xb7, 0xbf, 0xb6, 0x0c, 0xa7, 0xa2, 0xdc, 0xf6, 0xb8, 0x65, 0xc3, 0x86,
|
||||
0x8a, 0xe3, 0x38, 0xa4, 0x3d, 0xcc, 0x58, 0x8a, 0x44, 0xac, 0xdf, 0x0d, 0x40, 0x2f, 0xae, 0x71,
|
||||
0x2f, 0x1b, 0x7c, 0x86, 0xee, 0x5c, 0x12, 0xdd, 0xf9, 0xfb, 0xe9, 0x2e, 0x24, 0xd0, 0x5d, 0x9c,
|
||||
0xa1, 0xbb, 0x0d, 0x05, 0x16, 0xe0, 0x9e, 0xd4, 0x4c, 0x12, 0x3d, 0x12, 0x61, 0x3d, 0x80, 0xf7,
|
||||
0x66, 0x22, 0x57, 0x79, 0xb7, 0xbe, 0x85, 0x35, 0x07, 0x33, 0xf2, 0x13, 0x3e, 0xe6, 0x37, 0x69,
|
||||
0xd7, 0xd9, 0x80, 0xe2, 0x8f, 0xc4, 0xe3, 0x03, 0xcd, 0x85, 0x32, 0x44, 0x68, 0x03, 0x4c, 0xfa,
|
||||
0x03, 0xc5, 0x41, 0xdd, 0xd1, 0x96, 0xb5, 0x0d, 0xef, 0x08, 0xa2, 0x70, 0x5a, 0x4e, 0x7f, 0xcd,
|
||||
0x41, 0x5d, 0x03, 0xb5, 0x16, 0x96, 0x7d, 0xa0, 0x5a, 0x3b, 0xf9, 0xa9, 0x76, 0x76, 0x45, 0xba,
|
||||
0xa4, 0x6c, 0x44, 0x1a, 0x57, 0xbb, 0x8f, 0xe2, 0x0f, 0xf3, 0x6a, 0x47, 0xbf, 0x4d, 0xa5, 0x23,
|
||||
0x47, 0x43, 0xa7, 0x8c, 0x14, 0xef, 0x67, 0xa4, 0x94, 0xc0, 0x48, 0x79, 0x86, 0x91, 0x38, 0xe7,
|
||||
0x95, 0x39, 0xce, 0xe7, 0x24, 0x5d, 0x9d, 0x97, 0xb4, 0xf5, 0x12, 0x6a, 0x5f, 0x92, 0xe1, 0x30,
|
||||
0x43, 0xa5, 0x62, 0xa4, 0x3f, 0x56, 0x55, 0xdd, 0xd1, 0x96, 0x48, 0x84, 0x3b, 0x1c, 0xca, 0x44,
|
||||
0x54, 0x1c, 0x31, 0xb4, 0x3e, 0x87, 0xd5, 0x83, 0x21, 0x65, 0xf8, 0xf0, 0x65, 0x06, 0x72, 0xd5,
|
||||
0xed, 0x95, 0x50, 0x95, 0x61, 0x7d, 0x00, 0xef, 0x7e, 0x45, 0x18, 0x3f, 0x26, 0x5e, 0xea, 0xdb,
|
||||
0xd8, 0x86, 0xb5, 0x29, 0x54, 0x33, 0x89, 0xa0, 0x10, 0x10, 0x8f, 0x99, 0x46, 0x2b, 0xdf, 0xae,
|
||||
0x3b, 0x72, 0x6c, 0x7d, 0x0f, 0x0f, 0xa6, 0x25, 0x26, 0x5e, 0x97, 0x05, 0xd8, 0xe5, 0x03, 0xb5,
|
||||
0xb5, 0x23, 0xc7, 0xf1, 0x0a, 0x94, 0xcb, 0x52, 0x81, 0x1e, 0xc3, 0xda, 0xc9, 0x80, 0x8c, 0x0e,
|
||||
0xfd, 0x0b, 0x3a, 0x09, 0xe2, 0x21, 0x54, 0x44, 0xcf, 0x3b, 0x9b, 0xd6, 0x97, 0xb2, 0xb0, 0x8f,
|
||||
0x89, 0x67, 0x7d, 0x01, 0xeb, 0xaf, 0x02, 0x6f, 0xae, 0x3f, 0x74, 0xa1, 0x1a, 0x62, 0x46, 0xa3,
|
||||
0xb0, 0x87, 0x99, 0x74, 0x48, 0x3a, 0x75, 0x0a, 0xd3, 0x62, 0x0f, 0x79, 0x5a, 0x92, 0x9e, 0x49,
|
||||
0xad, 0x0b, 0x5c, 0x8a, 0xd6, 0xb5, 0xa6, 0x73, 0x13, 0x4d, 0x77, 0xff, 0x01, 0x28, 0x88, 0xbb,
|
||||
0xa1, 0x01, 0x14, 0xe5, 0x7b, 0x41, 0xb6, 0x9d, 0xd6, 0xe4, 0xed, 0xf8, 0x0b, 0x6c, 0x74, 0x32,
|
||||
0xe3, 0x75, 0x70, 0x0c, 0x4a, 0xaa, 0x9e, 0xa3, 0xdd, 0x74, 0xd7, 0x85, 0x46, 0xdb, 0xf8, 0x78,
|
||||
0x39, 0x27, 0x7d, 0xa8, 0xba, 0x5e, 0xc8, 0x33, 0x5e, 0x6f, 0x92, 0xf3, 0x8c, 0xd7, 0x8b, 0xe5,
|
||||
0xde, 0x81, 0x92, 0xaa, 0xfe, 0x68, 0x73, 0x81, 0xdf, 0x17, 0xe2, 0x8b, 0xa7, 0xf1, 0x51, 0xfa,
|
||||
0x96, 0x73, 0x7d, 0xec, 0x06, 0xea, 0x33, 0x1d, 0x05, 0x3d, 0xc9, 0xba, 0xc5, 0x6c, 0x4f, 0xf9,
|
||||
0x1f, 0x47, 0xbf, 0x86, 0xca, 0xf8, 0x01, 0xa2, 0x9d, 0x74, 0xef, 0xb9, 0x77, 0xdd, 0xe8, 0x2e,
|
||||
0xe3, 0xa2, 0x8f, 0x7c, 0x0a, 0xc5, 0x63, 0x37, 0x62, 0xc9, 0x09, 0x4c, 0x98, 0x47, 0x9f, 0x40,
|
||||
0xc9, 0xc1, 0x2c, 0x1a, 0x2d, 0xef, 0xf9, 0x03, 0x40, 0xec, 0x0b, 0xe5, 0x69, 0x06, 0x89, 0xdd,
|
||||
0x57, 0x6c, 0x12, 0xb7, 0x3f, 0x82, 0x82, 0xa8, 0xc0, 0xe8, 0x71, 0xfa, 0xc6, 0xb1, 0x4a, 0x9d,
|
||||
0xb8, 0xdd, 0x29, 0x14, 0x44, 0xd7, 0x45, 0x19, 0x9e, 0xc2, 0xe2, 0x77, 0x45, 0xe2, 0xae, 0xdf,
|
||||
0x40, 0x75, 0xd2, 0xb4, 0x51, 0x06, 0xde, 0xe6, 0x3b, 0x7c, 0xe2, 0xc6, 0x27, 0x50, 0xd6, 0xed,
|
||||
0x02, 0x65, 0xd0, 0xdf, 0x6c, 0x67, 0x49, 0xdc, 0xf4, 0x6b, 0xa8, 0x8c, 0x6b, 0x72, 0x22, 0xdb,
|
||||
0x19, 0x2e, 0xb1, 0x50, 0xd7, 0x5f, 0x41, 0x49, 0x15, 0xef, 0x2c, 0xd5, 0x69, 0xa1, 0xcc, 0x27,
|
||||
0x85, 0xbb, 0x7f, 0x74, 0xfb, 0xb6, 0xb9, 0xf2, 0xe7, 0xdb, 0xe6, 0xca, 0xcf, 0x77, 0x4d, 0xe3,
|
||||
0xf6, 0xae, 0x69, 0xfc, 0x71, 0xd7, 0x34, 0xfe, 0xbe, 0x6b, 0x1a, 0xdf, 0xed, 0x2e, 0xf7, 0xef,
|
||||
0xd8, 0x67, 0xe2, 0xf7, 0xbc, 0x24, 0xb7, 0xdf, 0xfd, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x53, 0xf2,
|
||||
0x71, 0x3d, 0xcc, 0x0d, 0x00, 0x00,
|
||||
}
|
||||
|
||||
@ -108,6 +108,7 @@ message StateResponse {
|
||||
string stdout = 6;
|
||||
string stderr = 7;
|
||||
bool terminal = 8;
|
||||
uint32 exit_status = 9;
|
||||
}
|
||||
|
||||
message KillRequest {
|
||||
|
||||
@ -66,6 +66,8 @@ func (t *Task) State(ctx context.Context) (runtime.State, error) {
|
||||
status = runtime.StoppedStatus
|
||||
case task.StatusPaused:
|
||||
status = runtime.PausedStatus
|
||||
case task.StatusPausing:
|
||||
status = runtime.PausingStatus
|
||||
}
|
||||
return runtime.State{
|
||||
Pid: response.Pid,
|
||||
@ -74,6 +76,7 @@ func (t *Task) State(ctx context.Context) (runtime.State, error) {
|
||||
Stdout: response.Stdout,
|
||||
Stderr: response.Stderr,
|
||||
Terminal: response.Terminal,
|
||||
ExitStatus: response.ExitStatus,
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
||||
15
process.go
15
process.go
@ -76,8 +76,12 @@ func (p *process) Wait(ctx context.Context) (uint32, error) {
|
||||
return UnknownExitStatus, err
|
||||
}
|
||||
// first check if the task has exited
|
||||
if status, _ := p.Status(ctx); status == Stopped {
|
||||
return UnknownExitStatus, errdefs.ErrUnavailable
|
||||
status, err := p.Status(ctx)
|
||||
if err != nil {
|
||||
return UnknownExitStatus, errdefs.FromGRPC(err)
|
||||
}
|
||||
if status.Status == Stopped {
|
||||
return status.ExitStatus, nil
|
||||
}
|
||||
for {
|
||||
evt, err := eventstream.Recv()
|
||||
@ -146,7 +150,10 @@ func (p *process) Status(ctx context.Context) (Status, error) {
|
||||
ExecID: p.id,
|
||||
})
|
||||
if err != nil {
|
||||
return "", errdefs.FromGRPC(err)
|
||||
return Status{}, errdefs.FromGRPC(err)
|
||||
}
|
||||
return Status(strings.ToLower(r.Process.Status.String())), nil
|
||||
return Status{
|
||||
Status: ProcessStatus(strings.ToLower(r.Process.Status.String())),
|
||||
ExitStatus: r.Process.ExitStatus,
|
||||
}, nil
|
||||
}
|
||||
|
||||
@ -68,6 +68,7 @@ const (
|
||||
StoppedStatus
|
||||
DeletedStatus
|
||||
PausedStatus
|
||||
PausingStatus
|
||||
)
|
||||
|
||||
type State struct {
|
||||
@ -75,6 +76,9 @@ type State struct {
|
||||
Status Status
|
||||
// Pid is the main process id for the container
|
||||
Pid uint32
|
||||
// ExitStatus of the process
|
||||
// Only vaid if the Status is Stopped
|
||||
ExitStatus uint32
|
||||
Stdin string
|
||||
Stdout string
|
||||
Stderr string
|
||||
|
||||
@ -227,6 +227,8 @@ func processFromContainerd(ctx context.Context, p runtime.Process) (*task.Proces
|
||||
status = task.StatusStopped
|
||||
case runtime.PausedStatus:
|
||||
status = task.StatusPaused
|
||||
case runtime.PausingStatus:
|
||||
status = task.StatusPausing
|
||||
default:
|
||||
log.G(ctx).WithField("status", state.Status).Warn("unknown status")
|
||||
}
|
||||
@ -238,6 +240,7 @@ func processFromContainerd(ctx context.Context, p runtime.Process) (*task.Proces
|
||||
Stdout: state.Stdout,
|
||||
Stderr: state.Stderr,
|
||||
Terminal: state.Terminal,
|
||||
ExitStatus: state.ExitStatus,
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
||||
33
task.go
33
task.go
@ -28,14 +28,19 @@ import (
|
||||
|
||||
const UnknownExitStatus = 255
|
||||
|
||||
type Status string
|
||||
type Status struct {
|
||||
Status ProcessStatus
|
||||
ExitStatus uint32
|
||||
}
|
||||
|
||||
type ProcessStatus string
|
||||
|
||||
const (
|
||||
Running Status = "running"
|
||||
Created Status = "created"
|
||||
Stopped Status = "stopped"
|
||||
Paused Status = "paused"
|
||||
Pausing Status = "pausing"
|
||||
Running ProcessStatus = "running"
|
||||
Created ProcessStatus = "created"
|
||||
Stopped ProcessStatus = "stopped"
|
||||
Paused ProcessStatus = "paused"
|
||||
Pausing ProcessStatus = "pausing"
|
||||
)
|
||||
|
||||
type IOCloseInfo struct {
|
||||
@ -146,12 +151,14 @@ func (t *task) Status(ctx context.Context) (Status, error) {
|
||||
ContainerID: t.id,
|
||||
})
|
||||
if err != nil {
|
||||
return "", errdefs.FromGRPC(err)
|
||||
return Status{}, errdefs.FromGRPC(err)
|
||||
}
|
||||
return Status(strings.ToLower(r.Process.Status.String())), nil
|
||||
return Status{
|
||||
Status: ProcessStatus(strings.ToLower(r.Process.Status.String())),
|
||||
ExitStatus: r.Process.ExitStatus,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// Wait is a blocking call that will wait for the task to exit and return the exit status
|
||||
func (t *task) Wait(ctx context.Context) (uint32, error) {
|
||||
eventstream, err := t.client.EventService().Subscribe(ctx, &eventsapi.SubscribeRequest{
|
||||
Filters: []string{"topic==" + runtime.TaskExitEventTopic},
|
||||
@ -160,8 +167,12 @@ func (t *task) Wait(ctx context.Context) (uint32, error) {
|
||||
return UnknownExitStatus, errdefs.FromGRPC(err)
|
||||
}
|
||||
// first check if the task has exited
|
||||
if status, _ := t.Status(ctx); status == Stopped {
|
||||
return UnknownExitStatus, errdefs.ErrUnavailable
|
||||
status, err := t.Status(ctx)
|
||||
if err != nil {
|
||||
return UnknownExitStatus, errdefs.FromGRPC(err)
|
||||
}
|
||||
if status.Status == Stopped {
|
||||
return status.ExitStatus, nil
|
||||
}
|
||||
for {
|
||||
evt, err := eventstream.Recv()
|
||||
|
||||
@ -45,6 +45,7 @@ func (p *process) State(ctx context.Context) (runtime.State, error) {
|
||||
Stdout: p.io.src.Stdout,
|
||||
Stderr: p.io.src.Stderr,
|
||||
Terminal: p.io.src.Terminal,
|
||||
ExitStatus: p.exitCode,
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
||||
@ -44,10 +44,14 @@ func (t *task) ID() string {
|
||||
}
|
||||
|
||||
func (t *task) State(ctx context.Context) (runtime.State, error) {
|
||||
var status runtime.Status
|
||||
var (
|
||||
status runtime.Status
|
||||
exitStatus uint32
|
||||
)
|
||||
|
||||
if p := t.getProcess(t.id); p != nil {
|
||||
status = p.Status()
|
||||
exitStatus = p.exitCode
|
||||
} else {
|
||||
status = t.getStatus()
|
||||
}
|
||||
@ -59,6 +63,7 @@ func (t *task) State(ctx context.Context) (runtime.State, error) {
|
||||
Stdout: t.io.src.Stdout,
|
||||
Stderr: t.io.src.Stderr,
|
||||
Terminal: t.io.src.Terminal,
|
||||
ExitStatus: exitStatus,
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user