From 01176f2d7f8948610ef637b6c9545fa51a196532 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Wed, 3 Feb 2016 14:30:45 -0800 Subject: [PATCH] Add pid and stdio to process state Signed-off-by: Michael Crosby --- api/grpc/server/server.go | 15 ++- api/grpc/types/api.pb.go | 205 +++++++++++++++++++------------------- api/grpc/types/api.proto | 4 + containerd-shim/main.go | 1 + ctr/container.go | 17 ++++ ctr/main.go | 1 + runtime/process.go | 15 +++ supervisor/sort_test.go | 16 +-- 8 files changed, 163 insertions(+), 111 deletions(-) diff --git a/api/grpc/server/server.go b/api/grpc/server/server.go index 876add0bd800..32393e51c90f 100644 --- a/api/grpc/server/server.go +++ b/api/grpc/server/server.go @@ -185,12 +185,17 @@ func (s *apiServer) State(ctx context.Context, r *types.StateRequest) (*types.St var procs []*types.Process for _, p := range processes { oldProc := p.Spec() + stdio := p.Stdio() procs = append(procs, &types.Process{ - Pid: p.ID(), - Terminal: oldProc.Terminal, - Args: oldProc.Args, - Env: oldProc.Env, - Cwd: oldProc.Cwd, + Pid: p.ID(), + SystemPid: uint32(p.SystemPid()), + Terminal: oldProc.Terminal, + Args: oldProc.Args, + Env: oldProc.Env, + Cwd: oldProc.Cwd, + Stdin: stdio.Stdin, + Stdout: stdio.Stdout, + Stderr: stdio.Stderr, User: &types.User{ Uid: oldProc.User.UID, Gid: oldProc.User.GID, diff --git a/api/grpc/types/api.pb.go b/api/grpc/types/api.pb.go index d6a47d45dc7d..2e81e767cfb4 100644 --- a/api/grpc/types/api.pb.go +++ b/api/grpc/types/api.pb.go @@ -269,12 +269,16 @@ func (*ContainerState) ProtoMessage() {} func (*ContainerState) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} } type Process struct { - Pid string `protobuf:"bytes,1,opt,name=pid" json:"pid,omitempty"` - Terminal bool `protobuf:"varint,2,opt,name=terminal" json:"terminal,omitempty"` - User *User `protobuf:"bytes,3,opt,name=user" json:"user,omitempty"` - Args []string `protobuf:"bytes,4,rep,name=args" json:"args,omitempty"` - Env []string `protobuf:"bytes,5,rep,name=env" json:"env,omitempty"` - Cwd string `protobuf:"bytes,6,opt,name=cwd" json:"cwd,omitempty"` + Pid string `protobuf:"bytes,1,opt,name=pid" json:"pid,omitempty"` + Terminal bool `protobuf:"varint,2,opt,name=terminal" json:"terminal,omitempty"` + User *User `protobuf:"bytes,3,opt,name=user" json:"user,omitempty"` + Args []string `protobuf:"bytes,4,rep,name=args" json:"args,omitempty"` + Env []string `protobuf:"bytes,5,rep,name=env" json:"env,omitempty"` + Cwd string `protobuf:"bytes,6,opt,name=cwd" json:"cwd,omitempty"` + SystemPid uint32 `protobuf:"varint,7,opt,name=systemPid" json:"systemPid,omitempty"` + Stdin string `protobuf:"bytes,8,opt,name=stdin" json:"stdin,omitempty"` + Stdout string `protobuf:"bytes,9,opt,name=stdout" json:"stdout,omitempty"` + Stderr string `protobuf:"bytes,10,opt,name=stderr" json:"stderr,omitempty"` } func (m *Process) Reset() { *m = Process{} } @@ -1135,99 +1139,100 @@ var _API_serviceDesc = grpc.ServiceDesc{ } var fileDescriptor0 = []byte{ - // 1493 bytes of a gzipped FileDescriptorProto + // 1509 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x58, 0xd9, 0x72, 0x1b, 0x45, - 0x17, 0xb6, 0xa4, 0xd1, 0x76, 0xb4, 0xd8, 0x1e, 0x2f, 0x91, 0x95, 0x3f, 0x7f, 0xc2, 0x10, 0x48, - 0x8a, 0x4a, 0xb9, 0x82, 0xc3, 0x12, 0xc2, 0x05, 0x04, 0x27, 0x95, 0x40, 0x25, 0xe0, 0x8a, 0x6d, - 0xaa, 0xb8, 0x41, 0x35, 0x9e, 0x69, 0xa4, 0x46, 0xa3, 0x99, 0x61, 0xa6, 0xc7, 0x4b, 0xf1, 0x06, - 0xdc, 0xf2, 0x22, 0x5c, 0xf1, 0x00, 0x3c, 0x01, 0xcf, 0xc1, 0x53, 0x70, 0x7a, 0x9b, 0x4d, 0x8b, - 0xe1, 0x82, 0x1b, 0x55, 0x75, 0xf7, 0x59, 0xbe, 0xf3, 0x9d, 0x65, 0xba, 0x05, 0x6d, 0x3b, 0xa4, - 0xfb, 0x61, 0x14, 0xb0, 0xc0, 0xac, 0xb3, 0xab, 0x90, 0xc4, 0xd6, 0x19, 0x6c, 0x9f, 0x86, 0xae, - 0xcd, 0xc8, 0x51, 0x14, 0x38, 0x24, 0x8e, 0xdf, 0x90, 0x9f, 0x12, 0x12, 0x33, 0x13, 0xa0, 0x4a, - 0xdd, 0x41, 0xe5, 0x4e, 0xe5, 0x7e, 0xdb, 0xec, 0x40, 0x2d, 0xc4, 0x45, 0x55, 0x2c, 0xf0, 0xc4, - 0xf1, 0x82, 0x98, 0x1c, 0x33, 0x97, 0xfa, 0x83, 0x1a, 0xee, 0xb5, 0xcc, 0x1e, 0xd4, 0x2f, 0xa8, - 0xcb, 0x26, 0x03, 0x03, 0x97, 0x3d, 0xb3, 0x0f, 0x8d, 0x09, 0xa1, 0xe3, 0x09, 0x1b, 0xd4, 0xf9, - 0xda, 0xba, 0x01, 0x3b, 0x25, 0x1f, 0x71, 0x18, 0xf8, 0x31, 0xb1, 0x7e, 0x86, 0xdd, 0xc3, 0x88, - 0xe0, 0xc1, 0x61, 0xe0, 0x33, 0x9b, 0xfa, 0x24, 0x5a, 0xe4, 0x1e, 0x17, 0x67, 0x89, 0xef, 0x7a, - 0xe4, 0xc8, 0x46, 0x17, 0x19, 0x8a, 0x09, 0x71, 0xa6, 0x61, 0x40, 0x7d, 0x26, 0x50, 0xb4, 0x39, - 0x8a, 0x58, 0x80, 0x32, 0xc4, 0x12, 0x51, 0xe0, 0x32, 0x48, 0x24, 0x0a, 0xbd, 0x26, 0x51, 0x34, - 0x68, 0xf0, 0xb5, 0xb5, 0x07, 0x37, 0xe6, 0x9c, 0x2b, 0x5c, 0x8f, 0xa1, 0x77, 0x4c, 0xc7, 0xbe, - 0xed, 0x5d, 0xcb, 0x06, 0x37, 0x2a, 0x24, 0x05, 0x86, 0x9e, 0xb5, 0x01, 0x7d, 0xad, 0xa9, 0x6c, - 0xfd, 0x56, 0x81, 0xcd, 0xa7, 0xae, 0xbb, 0x82, 0xde, 0x0d, 0x68, 0x31, 0x12, 0xcd, 0x28, 0xb7, - 0x52, 0x15, 0x7c, 0xee, 0x81, 0x91, 0xc4, 0x24, 0x12, 0x36, 0x3b, 0x07, 0x9d, 0x7d, 0x91, 0xaa, - 0xfd, 0x53, 0xdc, 0x32, 0xbb, 0x60, 0xd8, 0xd1, 0x38, 0xc6, 0x18, 0x6b, 0x12, 0x0b, 0xf1, 0xcf, - 0x31, 0x40, 0xb5, 0x70, 0x2e, 0x5c, 0x19, 0x9d, 0x46, 0xd9, 0x2c, 0x32, 0xd3, 0x2a, 0x31, 0xd3, - 0x2e, 0x31, 0x03, 0x82, 0x99, 0xc7, 0x60, 0x08, 0x5f, 0x68, 0x23, 0x51, 0x28, 0x7b, 0x7c, 0x31, - 0x56, 0x61, 0xf7, 0xcc, 0x5d, 0xe8, 0xdb, 0xae, 0x4b, 0x19, 0x0d, 0x10, 0xf4, 0x0b, 0xea, 0xc6, - 0x08, 0xb5, 0x86, 0xe1, 0x6f, 0x83, 0x99, 0x8f, 0x55, 0x51, 0xf0, 0x2a, 0x65, 0x3a, 0x4d, 0xd9, - 0x22, 0x1e, 0xde, 0x29, 0xe4, 0xb4, 0x2a, 0x62, 0xdf, 0x54, 0xb1, 0x67, 0x9a, 0xd6, 0x10, 0x06, - 0xf3, 0xd6, 0x94, 0xa7, 0x47, 0x70, 0xe3, 0x19, 0xf1, 0xc8, 0x75, 0x9e, 0x90, 0x44, 0xdf, 0x9e, - 0x11, 0x99, 0x43, 0x6e, 0x70, 0x5e, 0x49, 0x19, 0x7c, 0x1b, 0x76, 0x5e, 0xd1, 0x98, 0xad, 0x34, - 0x67, 0x7d, 0x07, 0x90, 0x09, 0xa4, 0xc6, 0x53, 0x57, 0xe4, 0x92, 0x32, 0x95, 0x58, 0x24, 0x91, - 0x39, 0xa1, 0xea, 0x9a, 0x2d, 0xe8, 0x24, 0x3e, 0xbd, 0x3c, 0x0e, 0x9c, 0x29, 0x61, 0xb1, 0xa8, - 0x5a, 0xd1, 0x4a, 0xf1, 0x84, 0x78, 0x9e, 0x28, 0xda, 0x96, 0xf5, 0x39, 0xec, 0x96, 0xfd, 0x4b, - 0x64, 0xe6, 0xbb, 0xd0, 0xc9, 0xd8, 0x8a, 0xd1, 0x5b, 0x6d, 0x31, 0x5d, 0x7d, 0xe8, 0x1e, 0x33, - 0x64, 0x4b, 0x01, 0xb7, 0xee, 0x40, 0x3f, 0x2d, 0x78, 0x71, 0x20, 0xd3, 0x6f, 0xb3, 0x24, 0x56, - 0xe1, 0x4c, 0xa1, 0xa9, 0x32, 0xa8, 0xab, 0xe8, 0xbf, 0xab, 0x53, 0xcb, 0x83, 0x76, 0x0a, 0x67, - 0x79, 0x8e, 0x4a, 0x33, 0x40, 0xf6, 0xfb, 0x5b, 0xd0, 0x0e, 0x25, 0x4e, 0x22, 0xfd, 0x74, 0x0e, - 0xfa, 0x0a, 0x82, 0xc6, 0x9f, 0x85, 0x26, 0x66, 0x80, 0x75, 0x0f, 0x9a, 0xaf, 0x6d, 0x67, 0x82, - 0xce, 0xb8, 0x7d, 0x27, 0x54, 0x31, 0x8b, 0x91, 0x35, 0x23, 0xb3, 0x20, 0xba, 0x12, 0xfe, 0x0c, - 0xeb, 0x5b, 0x9c, 0x00, 0x92, 0x35, 0x45, 0xf7, 0x5d, 0x2c, 0x4e, 0x8d, 0x53, 0xb3, 0xbd, 0xa1, - 0xd9, 0x4e, 0x03, 0xb8, 0x0d, 0xcd, 0x99, 0xb4, 0xaf, 0xea, 0x57, 0x03, 0x52, 0x5e, 0xad, 0xa7, - 0xb0, 0x2b, 0x47, 0xe1, 0xca, 0x89, 0x37, 0x37, 0x62, 0x64, 0x0c, 0x35, 0x3d, 0xb7, 0xe6, 0x4c, - 0xa8, 0x6a, 0x5d, 0x87, 0xde, 0xf3, 0x73, 0x82, 0xe5, 0xa0, 0x93, 0xfd, 0x67, 0x05, 0xea, 0x62, - 0x87, 0x87, 0xcb, 0x91, 0x28, 0x07, 0xd2, 0xd9, 0x22, 0xfb, 0xbd, 0x12, 0xd5, 0x46, 0x1e, 0x50, - 0xbd, 0x34, 0xf3, 0x9a, 0x42, 0x01, 0x83, 0x56, 0x79, 0x10, 0xf3, 0x65, 0x3e, 0x0b, 0x45, 0xee, - 0xda, 0x4b, 0xb8, 0x2b, 0xb6, 0x3f, 0x2c, 0x6b, 0xff, 0xdf, 0x2b, 0xd0, 0xfd, 0x9a, 0xb0, 0x8b, - 0x20, 0x9a, 0xf2, 0x0c, 0xc5, 0xa5, 0x7e, 0xc3, 0x22, 0x8d, 0x2e, 0x47, 0x67, 0x57, 0x0c, 0x6b, - 0x42, 0xa4, 0x92, 0xc7, 0x83, 0x3b, 0x47, 0xb6, 0xec, 0xb2, 0x9a, 0xd8, 0xdb, 0x84, 0xf6, 0x9b, - 0xcb, 0x11, 0x4e, 0xbc, 0x20, 0x92, 0x8d, 0x27, 0xc4, 0x70, 0xcb, 0x8d, 0x82, 0x30, 0x24, 0x32, - 0x52, 0x83, 0x1b, 0x3b, 0xd1, 0xc6, 0x1a, 0x5a, 0x0a, 0x77, 0x42, 0x65, 0xac, 0xa9, 0x8d, 0x9d, - 0xa4, 0xc6, 0x5a, 0x39, 0x31, 0x6d, 0xac, 0x2d, 0x4a, 0x6a, 0x06, 0xad, 0xc3, 0x30, 0x39, 0x8d, - 0xed, 0x31, 0xe1, 0xad, 0xcf, 0x02, 0x66, 0x7b, 0xa3, 0x84, 0x2f, 0x05, 0x74, 0xc3, 0xdc, 0x86, - 0x6e, 0x48, 0x22, 0x2c, 0x4a, 0xb5, 0x5b, 0x45, 0xa2, 0x0c, 0xf3, 0x26, 0x6c, 0x89, 0xe5, 0x88, - 0xfa, 0xa3, 0x29, 0x89, 0x7c, 0xe2, 0xcd, 0x02, 0x97, 0xa8, 0x38, 0xf6, 0x60, 0x33, 0x3d, 0xe4, - 0x9d, 0x28, 0x8e, 0x44, 0x3c, 0xd6, 0x09, 0xf4, 0x4f, 0x26, 0xf8, 0xa5, 0x67, 0x1e, 0xf5, 0xc7, - 0xcf, 0x6c, 0x66, 0x9b, 0xeb, 0x98, 0x27, 0x12, 0xd1, 0xc0, 0x8d, 0x95, 0x43, 0xd4, 0x66, 0x52, - 0x84, 0xb8, 0x23, 0x7d, 0x24, 0x49, 0xc3, 0x01, 0x9f, 0x1d, 0x31, 0x3a, 0x53, 0x0e, 0xad, 0xef, - 0x45, 0x10, 0x92, 0x78, 0x0b, 0xda, 0x19, 0xd8, 0x8a, 0xc8, 0xd7, 0xba, 0xce, 0x97, 0x0e, 0x74, - 0x1f, 0xd6, 0x59, 0x8a, 0x62, 0x84, 0x55, 0x6b, 0xab, 0xc6, 0xd8, 0x51, 0x92, 0x45, 0x8c, 0xd6, - 0x67, 0x00, 0xaf, 0x45, 0x1f, 0x0a, 0xc4, 0x38, 0x0c, 0xf3, 0x04, 0x21, 0xd1, 0x33, 0xfb, 0x32, - 0x65, 0x87, 0x6f, 0x61, 0x4c, 0x3f, 0xd8, 0xd4, 0x73, 0xd4, 0x25, 0xc0, 0xb0, 0xfe, 0xaa, 0x40, - 0x47, 0x5a, 0x90, 0x20, 0xd1, 0x84, 0x83, 0xbd, 0xa7, 0x4d, 0xdc, 0xd1, 0x16, 0x8b, 0x9f, 0x97, - 0x9c, 0x4f, 0x2c, 0xc3, 0xf8, 0xc2, 0x0e, 0x95, 0x97, 0xda, 0x32, 0xb1, 0x7b, 0xd0, 0x95, 0xd9, - 0x50, 0x82, 0xc6, 0x32, 0xc1, 0x07, 0xfc, 0xdb, 0x8b, 0x48, 0xc4, 0xf0, 0xeb, 0x1c, 0xdc, 0x2a, - 0x48, 0x08, 0x8c, 0xfb, 0xe2, 0xf7, 0xb9, 0xcf, 0xa2, 0xab, 0xe1, 0x03, 0x80, 0x6c, 0xc5, 0xdb, - 0x6e, 0x4a, 0xae, 0x54, 0x65, 0x63, 0x24, 0xe7, 0xb6, 0x97, 0xa8, 0xc8, 0x9f, 0x54, 0x1f, 0x57, - 0xac, 0xaf, 0x60, 0xfd, 0x0b, 0x6f, 0x4a, 0x83, 0x9c, 0x0a, 0x4a, 0xcd, 0xec, 0x1f, 0x83, 0x48, - 0xc5, 0xcb, 0x97, 0xd4, 0xc7, 0xa5, 0xa4, 0x0b, 0xfb, 0x3e, 0x08, 0xb3, 0xeb, 0x92, 0xb4, 0x27, - 0xeb, 0xe5, 0x8f, 0x1a, 0x40, 0x66, 0xcc, 0x7c, 0x02, 0x43, 0x1a, 0x8c, 0xb0, 0xa4, 0xce, 0xa9, - 0x43, 0x64, 0x0b, 0x8c, 0x22, 0xe2, 0x24, 0x51, 0x4c, 0xcf, 0x89, 0x9a, 0x7f, 0xbb, 0x2a, 0x96, - 0x32, 0x86, 0x0f, 0x61, 0x27, 0xd3, 0x75, 0x73, 0x6a, 0xd5, 0x95, 0x6a, 0x8f, 0x60, 0x0b, 0xd5, - 0x70, 0x70, 0x25, 0x05, 0xa5, 0xda, 0x4a, 0xa5, 0x4f, 0x60, 0x2f, 0x87, 0x93, 0x57, 0x6a, 0x4e, - 0xd5, 0x58, 0xa9, 0xfa, 0x11, 0xec, 0xa2, 0xea, 0x85, 0x4d, 0x59, 0x59, 0xaf, 0xfe, 0x0f, 0x70, - 0xce, 0x48, 0x34, 0x2e, 0xe0, 0x6c, 0xac, 0x54, 0x7a, 0x1f, 0x36, 0x51, 0xa9, 0xe4, 0xa7, 0x79, - 0x9d, 0x4a, 0x4c, 0x1c, 0x86, 0x53, 0x25, 0xa7, 0xd2, 0x5a, 0xa5, 0x82, 0x9f, 0x97, 0xee, 0xcb, - 0x64, 0x4c, 0x98, 0x77, 0x96, 0x56, 0xff, 0xbf, 0x6d, 0xa0, 0x5f, 0xaa, 0xd0, 0x39, 0x1c, 0x47, - 0x41, 0x12, 0x16, 0xba, 0x5c, 0xd6, 0xf0, 0x5c, 0x97, 0x4b, 0x99, 0xfb, 0xd0, 0x95, 0x5f, 0x4f, - 0x25, 0x26, 0x9b, 0xcb, 0x9c, 0x2f, 0x75, 0x7e, 0x6b, 0x39, 0xe3, 0x98, 0x95, 0x60, 0xb1, 0xbd, - 0x72, 0xe5, 0xf7, 0x29, 0xf4, 0x26, 0x32, 0x10, 0x25, 0x29, 0x53, 0x79, 0x57, 0x7b, 0xce, 0x00, - 0xee, 0xe7, 0x03, 0x96, 0x4d, 0xf4, 0x12, 0x36, 0xe7, 0x36, 0x8b, 0xbd, 0x64, 0xe5, 0x7b, 0xa9, - 0x73, 0xb0, 0xa5, 0xcc, 0xe6, 0xb5, 0x44, 0x83, 0x85, 0x50, 0x97, 0x78, 0xde, 0x83, 0x9e, 0x2f, - 0x3f, 0x3a, 0x29, 0x13, 0xb5, 0x9c, 0x62, 0xe1, 0x83, 0x84, 0x6c, 0x38, 0x02, 0xdf, 0x42, 0x36, - 0xf2, 0xdc, 0x62, 0x3e, 0x78, 0x45, 0xa0, 0xd8, 0x2c, 0x54, 0xf4, 0x0f, 0xe5, 0x75, 0x6d, 0xd1, - 0x43, 0xe1, 0xe0, 0xd7, 0x06, 0xd4, 0x9e, 0x1e, 0x7d, 0x69, 0xbe, 0x81, 0xf5, 0xd2, 0xcb, 0xc5, - 0xd4, 0x63, 0x65, 0xf1, 0x73, 0x6a, 0xf8, 0xff, 0x65, 0xc7, 0xea, 0xe2, 0xb0, 0xc6, 0x6d, 0x96, - 0x6e, 0x15, 0xa9, 0xcd, 0xc5, 0x17, 0x96, 0xd4, 0xe6, 0xb2, 0xcb, 0xc8, 0x9a, 0xf9, 0x31, 0x34, - 0xe4, 0x63, 0xc8, 0xdc, 0x56, 0xb2, 0x85, 0x57, 0xd5, 0x70, 0xa7, 0xb4, 0x9b, 0x2a, 0xbe, 0x82, - 0x5e, 0xe1, 0xc1, 0x68, 0xde, 0x2c, 0xf8, 0x2a, 0xbe, 0xa5, 0x86, 0xff, 0x5b, 0x7c, 0x98, 0x5a, - 0x3b, 0x04, 0xc8, 0x1e, 0x25, 0xe6, 0x40, 0x49, 0xcf, 0xbd, 0xc9, 0x86, 0x7b, 0x0b, 0x4e, 0x52, - 0x23, 0xa7, 0xb0, 0x51, 0x7e, 0x75, 0x98, 0x25, 0x56, 0xcb, 0x6f, 0x84, 0xe1, 0xed, 0xa5, 0xe7, - 0x79, 0xb3, 0xe5, 0xb7, 0x47, 0x6a, 0x76, 0xc9, 0x4b, 0x26, 0x35, 0xbb, 0xf4, 0xd1, 0xb2, 0x66, - 0x7e, 0x03, 0xfd, 0xe2, 0xb3, 0xc1, 0xd4, 0x24, 0x2d, 0x7c, 0xcd, 0x0c, 0x6f, 0x2d, 0x39, 0x4d, - 0x0d, 0x7e, 0x20, 0x1b, 0x01, 0x6f, 0x2e, 0x3a, 0x67, 0xb9, 0x37, 0xc5, 0x70, 0xbb, 0xb8, 0x99, - 0x6a, 0x3d, 0x84, 0x86, 0xbc, 0x8f, 0xa6, 0x05, 0x50, 0xb8, 0x9e, 0x0e, 0xbb, 0xf9, 0x5d, 0x6b, - 0xed, 0x61, 0x05, 0x67, 0x5e, 0xeb, 0x05, 0x61, 0xb2, 0x3b, 0xf2, 0xae, 0xe6, 0x54, 0xc4, 0x26, - 0x57, 0x39, 0x6b, 0x88, 0xff, 0x33, 0x1e, 0xfd, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xe9, 0x8d, 0xe9, - 0x67, 0xdc, 0x10, 0x00, 0x00, + 0x17, 0xb6, 0xa4, 0x91, 0x2c, 0x1d, 0x2d, 0xb6, 0xc7, 0x4b, 0x64, 0xe5, 0xcf, 0x9f, 0x30, 0x04, + 0x92, 0xa2, 0x52, 0xae, 0xe0, 0xb0, 0x84, 0x70, 0x01, 0xc1, 0x49, 0x25, 0x50, 0x09, 0xb8, 0x62, + 0x9b, 0x2a, 0x6e, 0x50, 0x8d, 0x67, 0x1a, 0xa9, 0xf1, 0x6c, 0xcc, 0xf4, 0x78, 0x29, 0xde, 0x80, + 0x5b, 0x9e, 0x83, 0x2a, 0xae, 0x78, 0x00, 0x9e, 0x80, 0xe7, 0xe0, 0x29, 0x38, 0xbd, 0xcd, 0xa6, + 0x25, 0xe4, 0x82, 0x1b, 0x55, 0x75, 0xf7, 0x59, 0xbe, 0xf3, 0x9d, 0x65, 0xba, 0x05, 0x1d, 0x3b, + 0xa2, 0x7b, 0x51, 0x1c, 0xb2, 0xd0, 0x6c, 0xb2, 0xab, 0x88, 0x24, 0xd6, 0x29, 0x6c, 0x9d, 0x44, + 0xae, 0xcd, 0xc8, 0x61, 0x1c, 0x3a, 0x24, 0x49, 0x5e, 0x91, 0x9f, 0x52, 0x92, 0x30, 0x13, 0xa0, + 0x4e, 0xdd, 0x61, 0xed, 0x56, 0xed, 0x6e, 0xc7, 0xec, 0x42, 0x23, 0xc2, 0x45, 0x5d, 0x2c, 0xf0, + 0xc4, 0xf1, 0xc2, 0x84, 0x1c, 0x31, 0x97, 0x06, 0xc3, 0x06, 0xee, 0xb5, 0xcd, 0x3e, 0x34, 0x2f, + 0xa8, 0xcb, 0xa6, 0x43, 0x03, 0x97, 0x7d, 0x73, 0x00, 0xad, 0x29, 0xa1, 0x93, 0x29, 0x1b, 0x36, + 0xf9, 0xda, 0xba, 0x06, 0xdb, 0x15, 0x1f, 0x49, 0x14, 0x06, 0x09, 0xb1, 0x7e, 0x86, 0x9d, 0x83, + 0x98, 0xe0, 0xc1, 0x41, 0x18, 0x30, 0x9b, 0x06, 0x24, 0x9e, 0xe7, 0x1e, 0x17, 0xa7, 0x69, 0xe0, + 0x7a, 0xe4, 0xd0, 0x46, 0x17, 0x39, 0x8a, 0x29, 0x71, 0xce, 0xa2, 0x90, 0x06, 0x4c, 0xa0, 0xe8, + 0x70, 0x14, 0x89, 0x00, 0x65, 0x88, 0x25, 0xa2, 0xc0, 0x65, 0x98, 0x4a, 0x14, 0x7a, 0x4d, 0xe2, + 0x78, 0xd8, 0xe2, 0x6b, 0x6b, 0x17, 0xae, 0xcd, 0x38, 0x57, 0xb8, 0x1e, 0x42, 0xff, 0x88, 0x4e, + 0x02, 0xdb, 0x7b, 0x2d, 0x1b, 0xdc, 0xa8, 0x90, 0x14, 0x18, 0xfa, 0xd6, 0x3a, 0x0c, 0xb4, 0xa6, + 0xb2, 0xf5, 0x7b, 0x0d, 0x36, 0x1e, 0xbb, 0xee, 0x12, 0x7a, 0xd7, 0xa1, 0xcd, 0x48, 0xec, 0x53, + 0x6e, 0xa5, 0x2e, 0xf8, 0xdc, 0x05, 0x23, 0x4d, 0x48, 0x2c, 0x6c, 0x76, 0xf7, 0xbb, 0x7b, 0x22, + 0x55, 0x7b, 0x27, 0xb8, 0x65, 0xf6, 0xc0, 0xb0, 0xe3, 0x49, 0x82, 0x31, 0x36, 0x24, 0x16, 0x12, + 0x9c, 0x63, 0x80, 0x6a, 0xe1, 0x5c, 0xb8, 0x32, 0x3a, 0x8d, 0x72, 0xb5, 0xcc, 0x4c, 0xbb, 0xc2, + 0x4c, 0xa7, 0xc2, 0x0c, 0x08, 0x66, 0x1e, 0x82, 0x21, 0x7c, 0xa1, 0x8d, 0x54, 0xa1, 0xec, 0xf3, + 0xc5, 0x44, 0x85, 0xdd, 0x37, 0x77, 0x60, 0x60, 0xbb, 0x2e, 0x65, 0x34, 0x44, 0xd0, 0xcf, 0xa8, + 0x9b, 0x20, 0xd4, 0x06, 0x86, 0xbf, 0x05, 0x66, 0x31, 0x56, 0x45, 0xc1, 0x8b, 0x8c, 0xe9, 0x2c, + 0x65, 0xf3, 0x78, 0x78, 0xa7, 0x94, 0xd3, 0xba, 0x88, 0x7d, 0x43, 0xc5, 0x9e, 0x6b, 0x5a, 0x23, + 0x18, 0xce, 0x5a, 0x53, 0x9e, 0x1e, 0xc0, 0xb5, 0x27, 0xc4, 0x23, 0xaf, 0xf3, 0x84, 0x24, 0x06, + 0xb6, 0x4f, 0x64, 0x0e, 0xb9, 0xc1, 0x59, 0x25, 0x65, 0xf0, 0x6d, 0xd8, 0x7e, 0x41, 0x13, 0xb6, + 0xd4, 0x9c, 0xf5, 0x1d, 0x40, 0x2e, 0x90, 0x19, 0xcf, 0x5c, 0x91, 0x4b, 0xca, 0x54, 0x62, 0x91, + 0x44, 0xe6, 0x44, 0xaa, 0x6b, 0x36, 0xa1, 0x9b, 0x06, 0xf4, 0xf2, 0x28, 0x74, 0xce, 0x08, 0x4b, + 0x44, 0xd5, 0x8a, 0x56, 0x4a, 0xa6, 0xc4, 0xf3, 0x44, 0xd1, 0xb6, 0xad, 0xcf, 0x61, 0xa7, 0xea, + 0x5f, 0x22, 0x33, 0xdf, 0x85, 0x6e, 0xce, 0x56, 0x82, 0xde, 0x1a, 0xf3, 0xe9, 0x1a, 0x40, 0xef, + 0x88, 0x21, 0x5b, 0x0a, 0xb8, 0x75, 0x0b, 0x06, 0x59, 0xc1, 0x8b, 0x03, 0x99, 0x7e, 0x9b, 0xa5, + 0x89, 0x0a, 0xe7, 0xb7, 0x1a, 0xac, 0xaa, 0x14, 0xea, 0x32, 0xfa, 0x0f, 0x0b, 0x75, 0x03, 0x3a, + 0xc9, 0x55, 0xc2, 0x88, 0x7f, 0xa8, 0xca, 0xb5, 0xff, 0xa6, 0xe5, 0xea, 0x41, 0x27, 0x8b, 0x68, + 0x71, 0x9a, 0x2b, 0x63, 0x44, 0x8e, 0x8c, 0xb7, 0xa0, 0x13, 0xc9, 0x48, 0x89, 0x44, 0xda, 0xdd, + 0x1f, 0xa8, 0x20, 0x34, 0x03, 0x39, 0x3b, 0x62, 0x8c, 0x58, 0x77, 0x60, 0xf5, 0xa5, 0xed, 0x4c, + 0xd1, 0x19, 0xb7, 0xef, 0x44, 0x8a, 0x36, 0x31, 0xf5, 0x7c, 0xe2, 0x87, 0xf1, 0x95, 0xf0, 0x67, + 0x58, 0xdf, 0xe2, 0x10, 0x91, 0xc4, 0xab, 0x8c, 0xdd, 0xc6, 0xfa, 0xd6, 0x38, 0x75, 0xc2, 0xd6, + 0x75, 0xc2, 0xb2, 0x00, 0x6e, 0xc2, 0xaa, 0x2f, 0xed, 0xab, 0x16, 0xd0, 0x80, 0x94, 0x57, 0xeb, + 0x31, 0xec, 0xc8, 0x69, 0xba, 0x74, 0x68, 0xce, 0x4c, 0x29, 0x19, 0x43, 0x43, 0x8f, 0xbe, 0x19, + 0x13, 0xaa, 0xe0, 0xd7, 0xa0, 0xff, 0xf4, 0x9c, 0x60, 0x45, 0xe9, 0x7a, 0xf9, 0xab, 0x06, 0x4d, + 0xb1, 0xc3, 0xc3, 0xe5, 0x48, 0x94, 0x03, 0xe9, 0x6c, 0x9e, 0xfd, 0x7e, 0x85, 0x6a, 0xa3, 0x08, + 0xa8, 0x59, 0x19, 0x9b, 0x32, 0xe3, 0x18, 0xb4, 0xca, 0x83, 0xc8, 0xf9, 0x6c, 0x16, 0xca, 0xdc, + 0x75, 0x16, 0x70, 0x57, 0x9e, 0x20, 0xb0, 0x68, 0x82, 0xfc, 0x51, 0x83, 0xde, 0xd7, 0x84, 0x5d, + 0x84, 0xf1, 0x19, 0xcf, 0x50, 0x52, 0x69, 0x59, 0x2c, 0xf3, 0xf8, 0x72, 0x7c, 0x7a, 0xc5, 0xb0, + 0x26, 0x44, 0x2a, 0x79, 0x3c, 0xb8, 0x73, 0x68, 0xcb, 0x46, 0x6d, 0x88, 0x3d, 0xac, 0xdb, 0x57, + 0x97, 0x63, 0xac, 0xc2, 0x30, 0x96, 0xbd, 0x2b, 0xc4, 0x70, 0xcb, 0x8d, 0xc3, 0x28, 0x22, 0x32, + 0x52, 0x83, 0x1b, 0x3b, 0xd6, 0xc6, 0x5a, 0x5a, 0x0a, 0x77, 0x22, 0x65, 0x6c, 0x55, 0x1b, 0x3b, + 0xce, 0x8c, 0xb5, 0x0b, 0x62, 0xda, 0x58, 0x47, 0x94, 0x94, 0x0f, 0xed, 0x83, 0x28, 0x3d, 0x49, + 0xec, 0x09, 0xe1, 0xd3, 0x83, 0x85, 0xcc, 0xf6, 0xc6, 0x29, 0x5f, 0x0a, 0xe8, 0x86, 0xb9, 0x05, + 0xbd, 0x88, 0xc4, 0x58, 0x94, 0x6a, 0xb7, 0x8e, 0x44, 0x19, 0xe6, 0x75, 0xd8, 0x14, 0xcb, 0x31, + 0x0d, 0xc6, 0x67, 0x24, 0x0e, 0x88, 0xe7, 0x87, 0x2e, 0x51, 0x71, 0xec, 0xc2, 0x46, 0x76, 0xc8, + 0x7b, 0x59, 0x1c, 0x89, 0x78, 0xac, 0x63, 0x18, 0x1c, 0x4f, 0xf1, 0xb2, 0xc0, 0x3c, 0x1a, 0x4c, + 0x9e, 0xd8, 0xcc, 0x36, 0xd7, 0x30, 0x4f, 0x24, 0xa6, 0xa1, 0x9b, 0x28, 0x87, 0xa8, 0xcd, 0xa4, + 0x08, 0x71, 0xc7, 0xfa, 0x48, 0x92, 0x86, 0xdf, 0x88, 0xfc, 0x88, 0x51, 0x5f, 0x39, 0xb4, 0xbe, + 0x17, 0x41, 0x48, 0xe2, 0x2d, 0xe8, 0xe4, 0x60, 0x6b, 0x22, 0x5f, 0x6b, 0x3a, 0x5f, 0x3a, 0xd0, + 0x3d, 0x58, 0x63, 0x19, 0x8a, 0x31, 0x56, 0xad, 0xad, 0x1a, 0x63, 0x5b, 0x49, 0x96, 0x31, 0x5a, + 0x9f, 0x01, 0xbc, 0x14, 0x7d, 0x28, 0x10, 0xe3, 0x2c, 0x29, 0x12, 0x84, 0x44, 0xfb, 0xf6, 0x65, + 0xc6, 0x0e, 0xdf, 0xc2, 0x98, 0x7e, 0xb0, 0xa9, 0xe7, 0xa8, 0x7b, 0x84, 0x61, 0xfd, 0x5d, 0x83, + 0xae, 0xb4, 0x20, 0x41, 0xa2, 0x09, 0x07, 0x7b, 0x4f, 0x9b, 0xb8, 0xa5, 0x2d, 0x96, 0xbf, 0x50, + 0x05, 0x9f, 0x58, 0x86, 0xc9, 0x85, 0x1d, 0x29, 0x2f, 0x8d, 0x45, 0x62, 0x77, 0xa0, 0x27, 0xb3, + 0xa1, 0x04, 0x8d, 0x45, 0x82, 0xf7, 0xf8, 0x3c, 0x44, 0x24, 0x62, 0x7c, 0x76, 0xf7, 0x6f, 0x94, + 0x24, 0x04, 0xc6, 0x3d, 0xf1, 0xfb, 0x34, 0x60, 0xf1, 0xd5, 0xe8, 0x1e, 0x40, 0xbe, 0xe2, 0x6d, + 0x77, 0x46, 0xae, 0x54, 0x65, 0x63, 0x24, 0xe7, 0xb6, 0x97, 0xaa, 0xc8, 0x1f, 0xd5, 0x1f, 0xd6, + 0xac, 0xaf, 0x60, 0xed, 0x0b, 0xef, 0x8c, 0x86, 0x05, 0x15, 0x94, 0xf2, 0xed, 0x1f, 0xc3, 0x58, + 0xc5, 0xcb, 0x97, 0x34, 0xc0, 0xa5, 0xa4, 0x0b, 0xfb, 0x3e, 0x8c, 0xf2, 0x1b, 0x97, 0xb4, 0x27, + 0xeb, 0xe5, 0xcf, 0x06, 0x40, 0x6e, 0xcc, 0x7c, 0x04, 0x23, 0x1a, 0x8e, 0xb1, 0xa4, 0xce, 0xa9, + 0x43, 0x64, 0x0b, 0x8c, 0x63, 0xe2, 0xa4, 0x71, 0x42, 0xcf, 0x89, 0x9a, 0x7f, 0x3b, 0x2a, 0x96, + 0x2a, 0x86, 0x0f, 0x61, 0x3b, 0xd7, 0x75, 0x0b, 0x6a, 0xf5, 0xa5, 0x6a, 0x0f, 0x60, 0x13, 0xd5, + 0x70, 0x70, 0xa5, 0x25, 0xa5, 0xc6, 0x52, 0xa5, 0x4f, 0x60, 0xb7, 0x80, 0x93, 0x57, 0x6a, 0x41, + 0xd5, 0x58, 0xaa, 0xfa, 0x11, 0xec, 0xa0, 0xea, 0x85, 0x4d, 0x59, 0x55, 0xaf, 0xf9, 0x2f, 0x70, + 0xfa, 0x24, 0x9e, 0x94, 0x70, 0xb6, 0x96, 0x2a, 0xbd, 0x0f, 0x1b, 0xa8, 0x54, 0xf1, 0xb3, 0xfa, + 0x3a, 0x95, 0x84, 0x38, 0x0c, 0xa7, 0x4a, 0x41, 0xa5, 0xbd, 0x4c, 0x05, 0x3f, 0x2f, 0xbd, 0xe7, + 0xe9, 0x84, 0x30, 0xef, 0x34, 0xab, 0xfe, 0x37, 0x6d, 0xa0, 0x5f, 0xea, 0xd0, 0x3d, 0x98, 0xc4, + 0x61, 0x1a, 0x95, 0xba, 0x5c, 0xd6, 0xf0, 0x4c, 0x97, 0x4b, 0x99, 0xbb, 0xd0, 0x93, 0x5f, 0x4f, + 0x25, 0x26, 0x9b, 0xcb, 0x9c, 0x2d, 0x75, 0x7e, 0xf1, 0x39, 0xe5, 0x98, 0x95, 0x60, 0xb9, 0xbd, + 0x0a, 0xe5, 0xf7, 0x29, 0xf4, 0xa7, 0x32, 0x10, 0x25, 0x29, 0x53, 0x79, 0x5b, 0x7b, 0xce, 0x01, + 0xee, 0x15, 0x03, 0x96, 0x4d, 0xf4, 0x1c, 0x36, 0x66, 0x36, 0xcb, 0xbd, 0x64, 0x15, 0x7b, 0xa9, + 0xbb, 0xbf, 0xa9, 0xcc, 0x16, 0xb5, 0x44, 0x83, 0x45, 0xd0, 0x94, 0x78, 0xde, 0x83, 0x7e, 0x20, + 0x3f, 0x3a, 0x19, 0x13, 0x8d, 0x82, 0x62, 0xe9, 0x83, 0x84, 0x6c, 0x38, 0x02, 0xdf, 0x5c, 0x36, + 0x8a, 0xdc, 0x62, 0x3e, 0x78, 0x45, 0xa0, 0x98, 0x1f, 0x29, 0xfa, 0x47, 0xf2, 0xc6, 0x37, 0xef, + 0xad, 0xb1, 0xff, 0x6b, 0x0b, 0x1a, 0x8f, 0x0f, 0xbf, 0x34, 0x5f, 0xc1, 0x5a, 0xe5, 0xf1, 0x63, + 0xea, 0xb1, 0x32, 0xff, 0x45, 0x36, 0xfa, 0xff, 0xa2, 0x63, 0x75, 0x71, 0x58, 0xe1, 0x36, 0x2b, + 0xb7, 0x8a, 0xcc, 0xe6, 0xfc, 0x0b, 0x4b, 0x66, 0x73, 0xd1, 0x65, 0x64, 0xc5, 0xfc, 0x18, 0x5a, + 0xf2, 0x3d, 0x65, 0x6e, 0x29, 0xd9, 0xd2, 0xc3, 0x6c, 0xb4, 0x5d, 0xd9, 0xcd, 0x14, 0x5f, 0x40, + 0xbf, 0xf4, 0xe6, 0x34, 0xaf, 0x97, 0x7c, 0x95, 0x9f, 0x63, 0xa3, 0xff, 0xcd, 0x3f, 0xcc, 0xac, + 0x1d, 0x00, 0xe4, 0xef, 0x1a, 0x73, 0xa8, 0xa4, 0x67, 0x9e, 0x75, 0xa3, 0xdd, 0x39, 0x27, 0x99, + 0x91, 0x13, 0x58, 0xaf, 0x3e, 0x5c, 0xcc, 0x0a, 0xab, 0xd5, 0x67, 0xc6, 0xe8, 0xe6, 0xc2, 0xf3, + 0xa2, 0xd9, 0xea, 0xf3, 0x25, 0x33, 0xbb, 0xe0, 0x31, 0x94, 0x99, 0x5d, 0xf8, 0xee, 0x59, 0x31, + 0xbf, 0x81, 0x41, 0xf9, 0xe5, 0x61, 0x6a, 0x92, 0xe6, 0x3e, 0x88, 0x46, 0x37, 0x16, 0x9c, 0x66, + 0x06, 0x3f, 0x90, 0x8d, 0x80, 0x37, 0x17, 0x9d, 0xb3, 0xc2, 0xb3, 0x64, 0xb4, 0x55, 0xde, 0xcc, + 0xb4, 0xee, 0x43, 0x4b, 0xde, 0x47, 0xb3, 0x02, 0x28, 0x5d, 0x4f, 0x47, 0xbd, 0xe2, 0xae, 0xb5, + 0x72, 0xbf, 0x86, 0x33, 0xaf, 0xfd, 0x8c, 0x30, 0xd9, 0x1d, 0x45, 0x57, 0x33, 0x2a, 0x62, 0x93, + 0xab, 0x9c, 0xb6, 0xc4, 0x5f, 0x22, 0x0f, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0x20, 0x9e, 0x7a, + 0x04, 0x1f, 0x11, 0x00, 0x00, } diff --git a/api/grpc/types/api.proto b/api/grpc/types/api.proto index 287fef939329..f886d8fc38dc 100644 --- a/api/grpc/types/api.proto +++ b/api/grpc/types/api.proto @@ -116,6 +116,10 @@ message Process { repeated string args = 4; // Arguments for process, first is binary path itself repeated string env = 5; // List of environment variables for process string cwd = 6; // Workind directory of process + uint32 systemPid = 7; + string stdin = 8; // path to the file where stdin will be read (optional) + string stdout = 9; // path to file where stdout will be written (optional) + string stderr = 10; // path to file where stderr will be written (optional) } message Container { diff --git a/containerd-shim/main.go b/containerd-shim/main.go index 9e46944b2742..9328991f3633 100644 --- a/containerd-shim/main.go +++ b/containerd-shim/main.go @@ -61,6 +61,7 @@ func main() { logrus.WithField("error", err).Fatal("shim: create new process") } if err := p.start(); err != nil { + p.delete() logrus.WithField("error", err).Fatal("shim: start process") } go func() { diff --git a/ctr/container.go b/ctr/container.go index 0c558db97a47..16df91f4c64e 100644 --- a/ctr/container.go +++ b/ctr/container.go @@ -54,6 +54,23 @@ var containersCommand = cli.Command{ Action: listContainers, } +var stateCommand = cli.Command{ + Name: "state", + Usage: "get a raw dump of the containerd state", + Action: func(context *cli.Context) { + c := getClient(context) + resp, err := c.State(netcontext.Background(), &types.StateRequest{}) + if err != nil { + fatal(err.Error(), 1) + } + data, err := json.Marshal(resp) + if err != nil { + fatal(err.Error(), 1) + } + fmt.Print(string(data)) + }, +} + var listCommand = cli.Command{ Name: "list", Usage: "list all running containers", diff --git a/ctr/main.go b/ctr/main.go index 3e41d8ec257b..d81960bc9ae6 100644 --- a/ctr/main.go +++ b/ctr/main.go @@ -31,6 +31,7 @@ func main() { checkpointCommand, containersCommand, eventsCommand, + stateCommand, } app.Before = func(context *cli.Context) error { if context.GlobalBool("debug") { diff --git a/runtime/process.go b/runtime/process.go index dd430beff1d2..4890fc34ad69 100644 --- a/runtime/process.go +++ b/runtime/process.go @@ -34,6 +34,10 @@ type Process interface { Signal(os.Signal) error // Container returns the container that the process belongs to Container() Container + // Stdio of the container + Stdio() Stdio + // SystemPid is the pid on the system + SystemPid() int } func newProcess(root, id string, c *container, s specs.Process, stdio Stdio) (*process, error) { @@ -82,6 +86,9 @@ func loadProcess(root, id string, c *container, s *ProcessState) (*process, erro Stderr: s.Stderr, }, } + if _, err := p.getPid(); err != nil { + return nil, err + } if _, err := p.ExitStatus(); err != nil { if err == ErrProcessNotExited { exit, err := getExitPipe(filepath.Join(root, ExitFile)) @@ -131,6 +138,10 @@ func (p *process) Container() Container { return p.container } +func (p *process) SystemPid() int { + return p.pid +} + // ExitFD returns the fd of the exit pipe func (p *process) ExitFD() int { return int(p.exitPipe.Fd()) @@ -169,6 +180,10 @@ func (p *process) Spec() specs.Process { return p.spec } +func (p *process) Stdio() Stdio { + return p.stdio +} + // Close closes any open files and/or resouces on the process func (p *process) Close() error { return p.exitPipe.Close() diff --git a/supervisor/sort_test.go b/supervisor/sort_test.go index 1f21767f9739..9202ac34c297 100644 --- a/supervisor/sort_test.go +++ b/supervisor/sort_test.go @@ -17,16 +17,20 @@ func (p *testProcess) ID() string { return p.id } -func (p *testProcess) Stdin() string { - return "" +func (p *testProcess) CloseStdin() error { + return nil } -func (p *testProcess) Stdout() string { - return "" +func (p *testProcess) Resize(w, h int) error { + return nil } -func (p *testProcess) Stderr() string { - return "" +func (p *testProcess) Stdio() runtime.Stdio { + return runtime.Stdio{} +} + +func (p *testProcess) SystemPid() int { + return -1 } func (p *testProcess) ExitFD() int {