From 30010ef5dc20d7844e5fdd7d7341a930da141d0c Mon Sep 17 00:00:00 2001 From: JmPotato Date: Mon, 22 Jul 2024 12:58:42 +0800 Subject: [PATCH] Add a new runaway action SwitchGroup Signed-off-by: JmPotato --- pkg/resource_manager/resource_manager.pb.go | 547 +++++++++++++++----- proto/resource_manager.proto | 19 +- scripts/proto.lock | 24 + 3 files changed, 456 insertions(+), 134 deletions(-) diff --git a/pkg/resource_manager/resource_manager.pb.go b/pkg/resource_manager/resource_manager.pb.go index 2bfb35c28..0f829c749 100644 --- a/pkg/resource_manager/resource_manager.pb.go +++ b/pkg/resource_manager/resource_manager.pb.go @@ -110,10 +110,11 @@ func (GroupMode) EnumDescriptor() ([]byte, []int) { type RunawayAction int32 const ( - RunawayAction_NoneAction RunawayAction = 0 - RunawayAction_DryRun RunawayAction = 1 - RunawayAction_CoolDown RunawayAction = 2 - RunawayAction_Kill RunawayAction = 3 + RunawayAction_NoneAction RunawayAction = 0 + RunawayAction_DryRun RunawayAction = 1 + RunawayAction_CoolDown RunawayAction = 2 + RunawayAction_Kill RunawayAction = 3 + RunawayAction_SwitchGroup RunawayAction = 4 ) var RunawayAction_name = map[int32]string{ @@ -121,13 +122,15 @@ var RunawayAction_name = map[int32]string{ 1: "DryRun", 2: "CoolDown", 3: "Kill", + 4: "SwitchGroup", } var RunawayAction_value = map[string]int32{ - "NoneAction": 0, - "DryRun": 1, - "CoolDown": 2, - "Kill": 3, + "NoneAction": 0, + "DryRun": 1, + "CoolDown": 2, + "Kill": 3, + "SwitchGroup": 4, } func (x RunawayAction) String() string { @@ -1756,6 +1759,64 @@ func (m *RunawayRule) GetExecElapsedTimeMs() uint64 { return 0 } +// RunawayActionV2 is the new version of RunawayAction, which is designed to +// provide better extensibility with different types of actions. +type RunawayActionV2 struct { + Type RunawayAction `protobuf:"varint,1,opt,name=type,proto3,enum=resource_manager.RunawayAction" json:"type,omitempty"` + SwitchGroupName string `protobuf:"bytes,2,opt,name=switch_group_name,json=switchGroupName,proto3" json:"switch_group_name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *RunawayActionV2) Reset() { *m = RunawayActionV2{} } +func (m *RunawayActionV2) String() string { return proto.CompactTextString(m) } +func (*RunawayActionV2) ProtoMessage() {} +func (*RunawayActionV2) Descriptor() ([]byte, []int) { + return fileDescriptor_7048dd9233ee965d, []int{24} +} +func (m *RunawayActionV2) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RunawayActionV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RunawayActionV2.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *RunawayActionV2) XXX_Merge(src proto.Message) { + xxx_messageInfo_RunawayActionV2.Merge(m, src) +} +func (m *RunawayActionV2) XXX_Size() int { + return m.Size() +} +func (m *RunawayActionV2) XXX_DiscardUnknown() { + xxx_messageInfo_RunawayActionV2.DiscardUnknown(m) +} + +var xxx_messageInfo_RunawayActionV2 proto.InternalMessageInfo + +func (m *RunawayActionV2) GetType() RunawayAction { + if m != nil { + return m.Type + } + return RunawayAction_NoneAction +} + +func (m *RunawayActionV2) GetSwitchGroupName() string { + if m != nil { + return m.SwitchGroupName + } + return "" +} + +// DEPRECATED: please use `RunawayActionV2` instead to obtain better extensibility. type RunawayWatch struct { // how long would the watch last LastingDurationMs int64 `protobuf:"varint,1,opt,name=lasting_duration_ms,json=lastingDurationMs,proto3" json:"lasting_duration_ms,omitempty"` @@ -1769,7 +1830,7 @@ func (m *RunawayWatch) Reset() { *m = RunawayWatch{} } func (m *RunawayWatch) String() string { return proto.CompactTextString(m) } func (*RunawayWatch) ProtoMessage() {} func (*RunawayWatch) Descriptor() ([]byte, []int) { - return fileDescriptor_7048dd9233ee965d, []int{24} + return fileDescriptor_7048dd9233ee965d, []int{25} } func (m *RunawayWatch) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1813,19 +1874,21 @@ func (m *RunawayWatch) GetType() RunawayWatchType { } type RunawaySettings struct { - Rule *RunawayRule `protobuf:"bytes,1,opt,name=rule,proto3" json:"rule,omitempty"` - Action RunawayAction `protobuf:"varint,2,opt,name=action,proto3,enum=resource_manager.RunawayAction" json:"action,omitempty"` - Watch *RunawayWatch `protobuf:"bytes,3,opt,name=watch,proto3" json:"watch,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Rule *RunawayRule `protobuf:"bytes,1,opt,name=rule,proto3" json:"rule,omitempty"` + // DEPRECATED: please use `action_v2` instead to obtain better extensibility. + Action RunawayAction `protobuf:"varint,2,opt,name=action,proto3,enum=resource_manager.RunawayAction" json:"action,omitempty"` + Watch *RunawayWatch `protobuf:"bytes,3,opt,name=watch,proto3" json:"watch,omitempty"` + ActionV2 *RunawayActionV2 `protobuf:"bytes,4,opt,name=action_v2,json=actionV2,proto3" json:"action_v2,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *RunawaySettings) Reset() { *m = RunawaySettings{} } func (m *RunawaySettings) String() string { return proto.CompactTextString(m) } func (*RunawaySettings) ProtoMessage() {} func (*RunawaySettings) Descriptor() ([]byte, []int) { - return fileDescriptor_7048dd9233ee965d, []int{25} + return fileDescriptor_7048dd9233ee965d, []int{26} } func (m *RunawaySettings) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1875,6 +1938,13 @@ func (m *RunawaySettings) GetWatch() *RunawayWatch { return nil } +func (m *RunawaySettings) GetActionV2() *RunawayActionV2 { + if m != nil { + return m.ActionV2 + } + return nil +} + type BackgroundSettings struct { JobTypes []string `protobuf:"bytes,1,rep,name=job_types,json=jobTypes,proto3" json:"job_types,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -1886,7 +1956,7 @@ func (m *BackgroundSettings) Reset() { *m = BackgroundSettings{} } func (m *BackgroundSettings) String() string { return proto.CompactTextString(m) } func (*BackgroundSettings) ProtoMessage() {} func (*BackgroundSettings) Descriptor() ([]byte, []int) { - return fileDescriptor_7048dd9233ee965d, []int{26} + return fileDescriptor_7048dd9233ee965d, []int{27} } func (m *BackgroundSettings) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1939,7 +2009,7 @@ func (m *Participant) Reset() { *m = Participant{} } func (m *Participant) String() string { return proto.CompactTextString(m) } func (*Participant) ProtoMessage() {} func (*Participant) Descriptor() ([]byte, []int) { - return fileDescriptor_7048dd9233ee965d, []int{27} + return fileDescriptor_7048dd9233ee965d, []int{28} } func (m *Participant) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2021,6 +2091,7 @@ func init() { proto.RegisterType((*TokenLimitSettings)(nil), "resource_manager.TokenLimitSettings") proto.RegisterType((*Error)(nil), "resource_manager.Error") proto.RegisterType((*RunawayRule)(nil), "resource_manager.RunawayRule") + proto.RegisterType((*RunawayActionV2)(nil), "resource_manager.RunawayActionV2") proto.RegisterType((*RunawayWatch)(nil), "resource_manager.RunawayWatch") proto.RegisterType((*RunawaySettings)(nil), "resource_manager.RunawaySettings") proto.RegisterType((*BackgroundSettings)(nil), "resource_manager.BackgroundSettings") @@ -2030,119 +2101,123 @@ func init() { func init() { proto.RegisterFile("resource_manager.proto", fileDescriptor_7048dd9233ee965d) } var fileDescriptor_7048dd9233ee965d = []byte{ - // 1782 bytes of a gzipped FileDescriptorProto + // 1844 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcd, 0x73, 0x1b, 0x49, - 0x15, 0xd7, 0xe8, 0x5b, 0x4f, 0xb1, 0x2d, 0xb7, 0x9d, 0x8d, 0x56, 0xa9, 0x38, 0xbb, 0x03, 0xa4, - 0x1c, 0x2f, 0xeb, 0x6c, 0x0c, 0xbb, 0xa1, 0x8a, 0x2a, 0xd8, 0xd8, 0x0e, 0xd9, 0xb0, 0x76, 0xd6, - 0xd5, 0x8e, 0x6a, 0x4f, 0xec, 0xd0, 0x9a, 0xe9, 0x28, 0x1d, 0x8d, 0x66, 0xe4, 0x9e, 0x1e, 0x2b, - 0xba, 0x51, 0x05, 0x27, 0xfe, 0x02, 0xfe, 0x04, 0x8a, 0x13, 0x55, 0xdc, 0xa0, 0xb8, 0x71, 0xe0, - 0xc8, 0x91, 0x23, 0x15, 0x2e, 0xfc, 0x11, 0x1c, 0xa8, 0xfe, 0x98, 0xd1, 0xc8, 0x23, 0xf9, 0xab, - 0x52, 0xec, 0x6d, 0xfa, 0x7d, 0xfc, 0xde, 0x47, 0xbf, 0xf7, 0xba, 0xa7, 0xe1, 0x3d, 0x4e, 0xa3, - 0x30, 0xe6, 0x2e, 0x75, 0x86, 0x24, 0x20, 0x7d, 0xca, 0xb7, 0x47, 0x3c, 0x14, 0x21, 0x6a, 0x9d, - 0xa5, 0x77, 0xd6, 0xfb, 0x61, 0x3f, 0x54, 0xcc, 0x07, 0xf2, 0x4b, 0xcb, 0x75, 0x56, 0x78, 0x1c, - 0x09, 0xf5, 0xa9, 0x09, 0xf6, 0x4f, 0xe1, 0xfd, 0x03, 0x16, 0x09, 0x6c, 0xd4, 0x9f, 0xf2, 0x30, - 0x1e, 0x45, 0x98, 0x9e, 0xc4, 0x34, 0x12, 0xc8, 0x86, 0xa5, 0x31, 0x13, 0xaf, 0x1c, 0x1e, 0x3b, - 0x91, 0x20, 0x22, 0x6a, 0x5b, 0x1f, 0x58, 0x9b, 0x75, 0xdc, 0x94, 0x44, 0x1c, 0x1f, 0x4b, 0x92, - 0xfd, 0x1b, 0x0b, 0x3a, 0xf3, 0x10, 0xa2, 0x51, 0x18, 0x44, 0x14, 0x7d, 0x0c, 0x15, 0xca, 0x79, - 0xc8, 0x95, 0x6a, 0x73, 0xe7, 0xd6, 0x76, 0x2e, 0x80, 0x27, 0x92, 0x8d, 0xb5, 0x14, 0x7a, 0x04, - 0xd5, 0xbe, 0x02, 0x68, 0x17, 0x3f, 0x28, 0x6d, 0x36, 0x77, 0xee, 0xe6, 0xe5, 0x67, 0x0c, 0x61, - 0x23, 0x6e, 0x0f, 0xe1, 0xd6, 0x53, 0x3a, 0xeb, 0x44, 0x12, 0xc5, 0x36, 0xac, 0xa5, 0x20, 0x4a, - 0xda, 0x09, 0xc8, 0x90, 0x2a, 0x87, 0x1a, 0x78, 0x95, 0x67, 0x55, 0x9e, 0x93, 0x21, 0xcd, 0x47, - 0x5d, 0xcc, 0x47, 0xfd, 0x2b, 0x0b, 0xda, 0x79, 0x7b, 0xd7, 0x8b, 0xf9, 0x53, 0xa8, 0x28, 0xb7, - 0x94, 0x9d, 0x4b, 0x84, 0xac, 0xa5, 0xed, 0x03, 0xe8, 0xec, 0x53, 0x9f, 0x0a, 0xfa, 0x2e, 0x82, - 0xb6, 0x7f, 0x09, 0xb7, 0xe7, 0xa2, 0x5d, 0x2f, 0x24, 0x04, 0xe5, 0x5e, 0xe8, 0x4d, 0x54, 0x44, - 0x0d, 0xac, 0xbe, 0xed, 0x23, 0xb8, 0x75, 0x14, 0xcf, 0xdf, 0xa1, 0x34, 0x03, 0xd6, 0x95, 0x32, - 0xf0, 0x0b, 0x68, 0xe7, 0x11, 0xdf, 0x9d, 0xc3, 0x7f, 0xb6, 0x60, 0xed, 0x45, 0x38, 0xa0, 0xc1, - 0x6e, 0xec, 0x0e, 0xa8, 0x48, 0xbb, 0xe2, 0x73, 0xa8, 0x73, 0xfd, 0x29, 0x1b, 0x42, 0x56, 0xe9, - 0x77, 0xf3, 0xe8, 0x19, 0x45, 0xa3, 0x87, 0x53, 0x2d, 0xf4, 0x08, 0xda, 0x82, 0xf0, 0x3e, 0x15, - 0x8e, 0x21, 0x39, 0x23, 0xca, 0x59, 0xe8, 0x39, 0x43, 0x5d, 0x6c, 0x65, 0x7c, 0x53, 0xf3, 0x8d, - 0xea, 0x91, 0xe2, 0x1e, 0x46, 0x68, 0x13, 0x5a, 0xae, 0xcf, 0x68, 0x20, 0x9c, 0x38, 0x60, 0x27, - 0x31, 0x75, 0x98, 0xd7, 0x2e, 0x29, 0x85, 0x65, 0x4d, 0xef, 0x2a, 0xf2, 0x33, 0xcf, 0xfe, 0x4f, - 0x19, 0x50, 0xde, 0x87, 0x2b, 0xf7, 0xc2, 0x97, 0x50, 0xe7, 0xb1, 0xc3, 0x04, 0x35, 0x9e, 0x35, - 0x77, 0xb6, 0x2f, 0x13, 0xeb, 0x76, 0x12, 0x73, 0xf7, 0x8b, 0x02, 0xae, 0xf1, 0xf8, 0x99, 0x04, - 0x40, 0x7d, 0x40, 0x9c, 0x8c, 0x9d, 0x54, 0x5f, 0xc3, 0x96, 0x14, 0xec, 0xa3, 0x2b, 0xc1, 0x92, - 0x71, 0xb2, 0xeb, 0x5f, 0x14, 0x70, 0x8b, 0x4f, 0x97, 0xda, 0x50, 0x0f, 0x36, 0xdc, 0x30, 0x88, - 0xe2, 0xe1, 0x48, 0xb0, 0x30, 0x70, 0x22, 0x16, 0xb8, 0xd4, 0xf1, 0x49, 0x94, 0xe6, 0xbb, 0x5d, - 0x56, 0x46, 0xef, 0xe4, 0x8d, 0xee, 0x4d, 0xf5, 0xf0, 0xed, 0x0c, 0xc8, 0xb1, 0xc4, 0x38, 0x20, - 0x51, 0x9a, 0xc9, 0xef, 0xc0, 0x12, 0x8b, 0x9c, 0x1e, 0x71, 0x07, 0x32, 0x8f, 0x81, 0xd7, 0xae, - 0xa8, 0x29, 0x71, 0x83, 0x45, 0xbb, 0x29, 0x0d, 0xdd, 0x01, 0x60, 0x91, 0x23, 0xd8, 0x4b, 0x9f, - 0x44, 0xaf, 0xda, 0x55, 0x25, 0xd1, 0x60, 0xd1, 0x0b, 0x4d, 0xe8, 0x3c, 0x87, 0x46, 0x9a, 0x28, - 0xf4, 0x18, 0x9a, 0x49, 0x35, 0x70, 0x27, 0x36, 0x95, 0xf5, 0xe1, 0xbc, 0x56, 0x50, 0x42, 0xdd, - 0x80, 0x09, 0x19, 0x2d, 0x6e, 0xf0, 0x04, 0xa2, 0xc3, 0x00, 0xe5, 0x33, 0x84, 0x8e, 0x61, 0x3d, - 0x05, 0xce, 0xa4, 0xff, 0x1c, 0x0b, 0xb3, 0xf9, 0xc4, 0x88, 0xe7, 0x40, 0x77, 0x1b, 0x50, 0x33, - 0x54, 0xfb, 0xb7, 0x16, 0xac, 0xcf, 0xf6, 0xc9, 0xf5, 0x7a, 0x70, 0x0f, 0x1a, 0xdc, 0xa8, 0x26, - 0xe3, 0xff, 0x7b, 0x17, 0x54, 0x85, 0x96, 0xc6, 0x53, 0x3d, 0xfb, 0xd7, 0xc5, 0x99, 0xa6, 0x4d, - 0x7d, 0xb9, 0x6a, 0xe1, 0x1f, 0x03, 0xea, 0x73, 0x12, 0x08, 0xea, 0xc9, 0xdd, 0x70, 0x84, 0x84, - 0x4c, 0xbc, 0xba, 0x97, 0xf7, 0xea, 0xa9, 0x96, 0xc5, 0xdd, 0xac, 0xed, 0x95, 0xfe, 0x0c, 0x55, - 0x36, 0xc0, 0xad, 0x14, 0x34, 0x41, 0x30, 0xc8, 0x25, 0x85, 0xfc, 0x60, 0x31, 0xf2, 0x34, 0xf7, - 0x59, 0x13, 0x37, 0x13, 0x13, 0x59, 0x5e, 0x64, 0xff, 0xc5, 0x82, 0xf5, 0x79, 0x2e, 0xa1, 0x4f, - 0xa1, 0x2c, 0x26, 0x23, 0x1d, 0xf7, 0xf2, 0x05, 0xd5, 0xf5, 0x62, 0x32, 0xa2, 0x58, 0x89, 0xa3, - 0x7d, 0x58, 0x4e, 0x1c, 0x4f, 0x33, 0xb1, 0xa0, 0x81, 0xb2, 0xde, 0x2d, 0x19, 0x25, 0x13, 0xfe, - 0x3d, 0x58, 0x11, 0x9c, 0xb9, 0x03, 0x9f, 0x3a, 0x82, 0x0d, 0xa9, 0x63, 0x9a, 0xbf, 0x84, 0x97, - 0x0c, 0xf9, 0x05, 0x1b, 0xd2, 0xc3, 0xc8, 0xfe, 0x9b, 0x05, 0x77, 0xce, 0x0d, 0xfb, 0x12, 0x61, - 0x64, 0xf4, 0xbe, 0xad, 0x30, 0xfe, 0x50, 0x84, 0x66, 0x66, 0x9c, 0x20, 0x04, 0x15, 0x6e, 0x5a, - 0xdb, 0xda, 0xb4, 0x70, 0x89, 0xe3, 0xae, 0xa4, 0x8d, 0x15, 0xad, 0xa8, 0x69, 0x63, 0xdc, 0x95, - 0x43, 0x83, 0x53, 0xe2, 0x39, 0xbd, 0x89, 0xa0, 0x1a, 0xda, 0x92, 0x15, 0x4e, 0xbc, 0x5d, 0x49, - 0x40, 0x77, 0xa1, 0x39, 0xe6, 0x4c, 0x50, 0xc3, 0x2f, 0x2b, 0x3e, 0x28, 0x92, 0x16, 0xb8, 0x0f, - 0xab, 0x22, 0x14, 0xc4, 0x77, 0xdc, 0x51, 0x9c, 0x7a, 0x58, 0x51, 0x62, 0xcb, 0x8a, 0xb1, 0x37, - 0x8a, 0xb5, 0x8b, 0xe8, 0x13, 0xb8, 0x19, 0x9d, 0xf8, 0x8e, 0x4f, 0x26, 0x94, 0xcf, 0x88, 0x57, - 0x95, 0xf8, 0x6a, 0x74, 0xe2, 0x1f, 0x48, 0xde, 0x54, 0xe3, 0x3e, 0xac, 0x0e, 0x4e, 0x1d, 0xe5, - 0x1f, 0x1f, 0xb9, 0x8e, 0x1b, 0xc6, 0x81, 0x68, 0xd7, 0x34, 0xf8, 0xe0, 0x14, 0x53, 0xe2, 0xe1, - 0x91, 0xbb, 0x27, 0xa9, 0xe8, 0x23, 0x40, 0x83, 0x53, 0x47, 0xfb, 0x3a, 0x95, 0xad, 0x2b, 0xd9, - 0x95, 0xc1, 0xe9, 0xd7, 0x92, 0x91, 0x08, 0xdb, 0xdf, 0xc0, 0xca, 0x99, 0xc1, 0x76, 0xdd, 0x5a, - 0x5d, 0x87, 0xca, 0x29, 0xf1, 0x63, 0x6a, 0x52, 0xaa, 0x17, 0x0a, 0x7f, 0x76, 0xac, 0x5d, 0xb7, - 0x88, 0xe6, 0xe3, 0xff, 0xb7, 0x04, 0x4b, 0x33, 0x37, 0x11, 0x79, 0xa5, 0xc8, 0x8c, 0x18, 0xf5, - 0x8d, 0x1e, 0x40, 0x79, 0x18, 0x7a, 0x5a, 0x75, 0x79, 0xe7, 0xf6, 0xbc, 0x6e, 0x0f, 0xe3, 0xd1, - 0x61, 0xe8, 0x51, 0xac, 0x04, 0xd1, 0x01, 0xdc, 0x90, 0xe3, 0x27, 0xa2, 0x42, 0xb0, 0xa0, 0x9f, - 0x1c, 0x96, 0x5b, 0x0b, 0x14, 0x33, 0x09, 0x39, 0x36, 0x1a, 0x18, 0x78, 0x37, 0xf9, 0x46, 0xdf, - 0xc0, 0xcd, 0x99, 0x03, 0x38, 0x85, 0x2d, 0x9f, 0x0f, 0x3b, 0xcd, 0x43, 0x0a, 0xbb, 0xc6, 0xf3, - 0x44, 0xd4, 0x81, 0xfa, 0x88, 0xb3, 0x90, 0x33, 0x31, 0x51, 0x05, 0xb7, 0x84, 0xd3, 0x35, 0x3a, - 0x80, 0x16, 0x8f, 0x03, 0x32, 0x26, 0x93, 0xa9, 0xd9, 0xaa, 0x32, 0x3b, 0x2f, 0xf3, 0x5a, 0x32, - 0xb5, 0xb6, 0xc2, 0x67, 0x09, 0xa8, 0x0b, 0x6b, 0xd3, 0xa3, 0x77, 0x0a, 0x58, 0x53, 0x80, 0x73, - 0xae, 0x63, 0xd3, 0x33, 0x39, 0xc5, 0x44, 0xbd, 0x1c, 0x0d, 0x3d, 0x82, 0x1a, 0xee, 0xaa, 0x1b, - 0xbe, 0xaa, 0xd3, 0x0b, 0x6f, 0x08, 0x89, 0xb4, 0xfd, 0x73, 0x68, 0x2f, 0xda, 0x01, 0xb4, 0x0d, - 0xa5, 0xa4, 0xeb, 0x2f, 0x1c, 0x35, 0x45, 0xde, 0xb5, 0xff, 0x6a, 0x25, 0x60, 0x73, 0x52, 0xfc, - 0x00, 0x4a, 0xee, 0xe8, 0x92, 0x60, 0x52, 0x12, 0x7d, 0x06, 0x35, 0x16, 0xaa, 0x86, 0xbd, 0xdc, - 0xb0, 0xab, 0xb2, 0x50, 0x76, 0x31, 0xfa, 0x11, 0xd4, 0x59, 0xa8, 0xbb, 0xd7, 0x54, 0xdd, 0x05, - 0x8a, 0x35, 0x16, 0xaa, 0x96, 0xb6, 0xfb, 0xd0, 0xcc, 0xce, 0xea, 0xcf, 0xa1, 0x9e, 0xee, 0x8f, - 0xb5, 0x68, 0x7f, 0x94, 0xc2, 0x01, 0x1b, 0x66, 0x0a, 0x37, 0xd5, 0x42, 0xef, 0x41, 0x35, 0x33, - 0xae, 0x2d, 0x6c, 0x56, 0xf6, 0x89, 0xb9, 0xe2, 0xce, 0xe8, 0xa1, 0xdb, 0xd0, 0x78, 0xc9, 0x7c, - 0xdf, 0xe1, 0x44, 0xe8, 0xe6, 0x2b, 0xe3, 0xba, 0x24, 0x60, 0x22, 0xa8, 0x1c, 0x9e, 0xbd, 0x98, - 0x47, 0xc2, 0xf1, 0xa5, 0x8e, 0xc2, 0x2b, 0x61, 0x50, 0x24, 0x85, 0x22, 0x87, 0xef, 0x90, 0xbc, - 0x99, 0x9e, 0xca, 0x6a, 0xf8, 0x0e, 0xc9, 0x1b, 0x73, 0xb0, 0x7e, 0x08, 0x15, 0x75, 0x67, 0x41, - 0x6d, 0xa8, 0x0d, 0x69, 0x14, 0x91, 0x7e, 0xd2, 0xe0, 0xc9, 0xd2, 0xfe, 0x09, 0x34, 0x4d, 0xf9, - 0xe2, 0xd8, 0x97, 0x2d, 0xbf, 0x4e, 0xdf, 0x50, 0xd7, 0xa1, 0x3e, 0x19, 0x45, 0xf2, 0xe0, 0x31, - 0x13, 0x56, 0x7b, 0xb6, 0x2a, 0x79, 0x4f, 0x34, 0xcb, 0x1c, 0x1b, 0xa7, 0x70, 0xc3, 0xe8, 0x7f, - 0x4d, 0x84, 0xfb, 0x4a, 0xde, 0x5c, 0xe4, 0xd5, 0x95, 0x05, 0x7d, 0xc7, 0x8b, 0x39, 0x51, 0x37, - 0x5a, 0xa3, 0x5f, 0xc2, 0xab, 0x86, 0xb5, 0x6f, 0x38, 0x87, 0x11, 0xfa, 0xcc, 0x8c, 0x35, 0x3d, - 0x63, 0xec, 0x85, 0xcd, 0xa5, 0xd0, 0xa7, 0x73, 0xcd, 0xfe, 0x93, 0x05, 0x2b, 0x67, 0xfa, 0x0e, - 0x3d, 0x84, 0x32, 0x8f, 0x7d, 0xba, 0xb8, 0xdc, 0x32, 0x91, 0x62, 0x25, 0x2a, 0xff, 0xe0, 0x89, - 0x2b, 0x5d, 0x31, 0x0e, 0xdc, 0x5d, 0xa8, 0xf4, 0x58, 0x89, 0x61, 0x23, 0x8e, 0x7e, 0x08, 0x95, - 0xb1, 0x74, 0xc9, 0x54, 0xdb, 0xc6, 0xf9, 0x8e, 0x63, 0x2d, 0x6c, 0x3f, 0x04, 0x94, 0xef, 0x6d, - 0x59, 0x03, 0xaf, 0xc3, 0x9e, 0x23, 0xe3, 0xd2, 0xff, 0x68, 0x0d, 0x5c, 0x7f, 0x1d, 0xf6, 0x64, - 0xb4, 0x91, 0x8d, 0xa1, 0x79, 0x44, 0xb8, 0x60, 0x2e, 0x1b, 0x91, 0x40, 0xcc, 0x9d, 0xd3, 0xcb, - 0x50, 0x64, 0x9e, 0xf9, 0x15, 0x2b, 0x32, 0x4f, 0x96, 0x8d, 0xcf, 0x22, 0x41, 0x03, 0x27, 0xe6, - 0xbe, 0xbe, 0xac, 0x35, 0x30, 0x68, 0x52, 0x97, 0xfb, 0xd1, 0xd6, 0xfb, 0x33, 0xc7, 0x97, 0xb4, - 0x83, 0xaa, 0x50, 0xc4, 0xdd, 0x56, 0x61, 0xeb, 0xc7, 0x33, 0x27, 0x8f, 0x62, 0xd5, 0xa0, 0xb4, - 0x77, 0xd4, 0x6d, 0x15, 0xd0, 0x32, 0xc0, 0xb3, 0xaf, 0x64, 0xbb, 0xfd, 0xcc, 0x0f, 0xc7, 0x2d, - 0x0b, 0xad, 0x40, 0xf3, 0xd9, 0x57, 0xaa, 0x8b, 0x14, 0xa1, 0xb8, 0xf5, 0x10, 0x1a, 0xe9, 0x91, - 0x80, 0x9a, 0x50, 0xeb, 0x06, 0x83, 0x20, 0x1c, 0x07, 0xad, 0x02, 0x02, 0xa8, 0xe2, 0xae, 0x24, - 0xb7, 0x2c, 0xc9, 0xc0, 0x64, 0xac, 0x16, 0xc5, 0xad, 0x3d, 0x58, 0x9a, 0x49, 0xb0, 0x34, 0xf2, - 0x3c, 0x0c, 0xa8, 0x5e, 0x69, 0xcd, 0x7d, 0x3e, 0xc1, 0x71, 0xd0, 0xb2, 0xd0, 0x0d, 0xa8, 0xef, - 0x85, 0xa1, 0xbf, 0x2f, 0x31, 0x8b, 0xa8, 0x0e, 0xe5, 0x2f, 0x99, 0xef, 0xb7, 0x4a, 0x5b, 0x7b, - 0xd0, 0x3a, 0x5b, 0x26, 0x68, 0x09, 0x1a, 0x12, 0x47, 0x11, 0x5a, 0x05, 0xd4, 0x80, 0xca, 0x93, - 0x37, 0xc4, 0x15, 0xda, 0xfe, 0x31, 0x1b, 0x32, 0x9f, 0x70, 0x0d, 0x72, 0xe4, 0x93, 0xa0, 0x55, - 0xda, 0xf9, 0x63, 0x45, 0x66, 0x45, 0xc7, 0x7d, 0xa8, 0xf7, 0x10, 0x9d, 0x00, 0xca, 0xbf, 0x16, - 0xa1, 0x8f, 0xf2, 0x9b, 0xbd, 0xf0, 0x55, 0xaa, 0xf3, 0xfd, 0xcb, 0x09, 0xeb, 0x8b, 0xbf, 0x5d, - 0x40, 0x03, 0x68, 0x9d, 0x7d, 0xaa, 0x41, 0xf7, 0xe7, 0x1c, 0x75, 0xf3, 0x9f, 0x8f, 0x3a, 0x5b, - 0x97, 0x11, 0xcd, 0x1a, 0x7b, 0xec, 0x79, 0x17, 0x1a, 0x5b, 0xf0, 0x12, 0x32, 0xcf, 0xd8, 0xa2, - 0x27, 0x0e, 0xbb, 0x80, 0x02, 0x58, 0x3b, 0x0c, 0x3d, 0xf6, 0x72, 0xf2, 0x7f, 0xb2, 0x27, 0x60, - 0x6d, 0xce, 0x23, 0x11, 0x9a, 0xb3, 0x21, 0x8b, 0x5f, 0xa6, 0x3a, 0x1f, 0x5f, 0x52, 0x3a, 0xb5, - 0xfa, 0x1a, 0xd6, 0x1e, 0xbb, 0x27, 0x31, 0xe3, 0xd9, 0x5f, 0x80, 0x08, 0x9d, 0xff, 0x6f, 0x98, - 0x56, 0xcb, 0xbd, 0x8b, 0xc4, 0x12, 0x3b, 0x9b, 0xd6, 0x27, 0xd6, 0xee, 0xfa, 0x3f, 0x7f, 0x5f, - 0xb7, 0xfe, 0xfe, 0x76, 0xc3, 0xfa, 0xc7, 0xdb, 0x0d, 0xeb, 0x5f, 0x6f, 0x37, 0xac, 0xdf, 0xfd, - 0x7b, 0xa3, 0xd0, 0xab, 0xaa, 0xb7, 0xd2, 0x1f, 0xfc, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x17, 0xdf, - 0xf0, 0xa9, 0x7e, 0x15, 0x00, 0x00, + 0x15, 0xd7, 0xe8, 0x5b, 0x4f, 0xb1, 0x25, 0xb7, 0x9d, 0x8d, 0x56, 0xa9, 0x38, 0x9b, 0x01, 0x52, + 0x89, 0x97, 0x75, 0x36, 0x5e, 0x76, 0x4d, 0x15, 0x55, 0xcb, 0xc6, 0x76, 0xc8, 0x86, 0xb5, 0xb3, + 0xae, 0xb6, 0xb5, 0x7b, 0x62, 0x87, 0xd6, 0xa8, 0xa3, 0x74, 0x34, 0x9a, 0x91, 0x7b, 0x7a, 0xac, + 0xe8, 0x46, 0x15, 0x9c, 0xf8, 0x0b, 0xf8, 0x13, 0x28, 0x4e, 0x9c, 0xa1, 0xb8, 0x71, 0xe0, 0xc8, + 0x91, 0x23, 0x15, 0x2e, 0xdc, 0xb9, 0x72, 0xa0, 0xfa, 0x63, 0x46, 0xa3, 0x8c, 0x64, 0x39, 0xae, + 0x2d, 0xf6, 0x36, 0xf3, 0x3e, 0x7e, 0xef, 0xa3, 0xdf, 0x7b, 0xfd, 0x01, 0xef, 0x70, 0x1a, 0x06, + 0x11, 0x77, 0xa9, 0x33, 0x24, 0x3e, 0xe9, 0x53, 0xbe, 0x3d, 0xe2, 0x81, 0x08, 0x50, 0xf3, 0x4d, + 0x7a, 0x7b, 0xa3, 0x1f, 0xf4, 0x03, 0xc5, 0x7c, 0x20, 0xbf, 0xb4, 0x5c, 0xbb, 0xc1, 0xa3, 0x50, + 0xa8, 0x4f, 0x4d, 0xb0, 0x7f, 0x0a, 0xef, 0x1e, 0xb2, 0x50, 0x60, 0xa3, 0xfe, 0x84, 0x07, 0xd1, + 0x28, 0xc4, 0xf4, 0x2c, 0xa2, 0xa1, 0x40, 0x36, 0xac, 0x8c, 0x99, 0x78, 0xe1, 0xf0, 0xc8, 0x09, + 0x05, 0x11, 0x61, 0xcb, 0x7a, 0xcf, 0xba, 0x57, 0xc5, 0x75, 0x49, 0xc4, 0xd1, 0x89, 0x24, 0xd9, + 0xbf, 0xb1, 0xa0, 0x3d, 0x0f, 0x21, 0x1c, 0x05, 0x7e, 0x48, 0xd1, 0x07, 0x50, 0xa2, 0x9c, 0x07, + 0x5c, 0xa9, 0xd6, 0x77, 0x6e, 0x6c, 0x67, 0x02, 0x78, 0x2c, 0xd9, 0x58, 0x4b, 0xa1, 0x5d, 0x28, + 0xf7, 0x15, 0x40, 0x2b, 0xff, 0x5e, 0xe1, 0x5e, 0x7d, 0xe7, 0x76, 0x56, 0x7e, 0xc6, 0x10, 0x36, + 0xe2, 0xf6, 0x10, 0x6e, 0x3c, 0xa1, 0xb3, 0x4e, 0xc4, 0x51, 0x6c, 0xc3, 0x7a, 0x02, 0xa2, 0xa4, + 0x1d, 0x9f, 0x0c, 0xa9, 0x72, 0xa8, 0x86, 0xd7, 0x78, 0x5a, 0xe5, 0x19, 0x19, 0xd2, 0x6c, 0xd4, + 0xf9, 0x6c, 0xd4, 0xbf, 0xb2, 0xa0, 0x95, 0xb5, 0x77, 0xb5, 0x98, 0x3f, 0x86, 0x92, 0x72, 0x4b, + 0xd9, 0xb9, 0x44, 0xc8, 0x5a, 0xda, 0x3e, 0x84, 0xf6, 0x01, 0xf5, 0xa8, 0xa0, 0xdf, 0x46, 0xd0, + 0xf6, 0x2f, 0xe1, 0xe6, 0x5c, 0xb4, 0xab, 0x85, 0x84, 0xa0, 0xd8, 0x0d, 0x7a, 0x13, 0x15, 0x51, + 0x0d, 0xab, 0x6f, 0xfb, 0x18, 0x6e, 0x1c, 0x47, 0xf3, 0x57, 0x28, 0xc9, 0x80, 0xf5, 0x56, 0x19, + 0xf8, 0x05, 0xb4, 0xb2, 0x88, 0xdf, 0x9e, 0xc3, 0x7f, 0xb2, 0x60, 0xfd, 0x34, 0x18, 0x50, 0x7f, + 0x2f, 0x72, 0x07, 0x54, 0x24, 0x5d, 0xf1, 0x19, 0x54, 0xb9, 0xfe, 0x94, 0x0d, 0x21, 0xab, 0xf4, + 0xfb, 0x59, 0xf4, 0x94, 0xa2, 0xd1, 0xc3, 0x89, 0x16, 0xda, 0x85, 0x96, 0x20, 0xbc, 0x4f, 0x85, + 0x63, 0x48, 0xce, 0x88, 0x72, 0x16, 0xf4, 0x9c, 0xa1, 0x2e, 0xb6, 0x22, 0xbe, 0xae, 0xf9, 0x46, + 0xf5, 0x58, 0x71, 0x8f, 0x42, 0x74, 0x0f, 0x9a, 0xae, 0xc7, 0xa8, 0x2f, 0x9c, 0xc8, 0x67, 0x67, + 0x11, 0x75, 0x58, 0xaf, 0x55, 0x50, 0x0a, 0xab, 0x9a, 0xde, 0x51, 0xe4, 0xa7, 0x3d, 0xfb, 0xdf, + 0x45, 0x40, 0x59, 0x1f, 0xde, 0xba, 0x17, 0xbe, 0x80, 0x2a, 0x8f, 0x1c, 0x26, 0xa8, 0xf1, 0xac, + 0xbe, 0xb3, 0x7d, 0x99, 0x58, 0xb7, 0xe3, 0x98, 0x3b, 0x9f, 0xe7, 0x70, 0x85, 0x47, 0x4f, 0x25, + 0x00, 0xea, 0x03, 0xe2, 0x64, 0xec, 0x24, 0xfa, 0x1a, 0xb6, 0xa0, 0x60, 0x77, 0xdf, 0x0a, 0x96, + 0x8c, 0xe3, 0x55, 0xff, 0x3c, 0x87, 0x9b, 0x7c, 0xfa, 0xab, 0x0d, 0x75, 0x61, 0xd3, 0x0d, 0xfc, + 0x30, 0x1a, 0x8e, 0x04, 0x0b, 0x7c, 0x27, 0x64, 0xbe, 0x4b, 0x1d, 0x8f, 0x84, 0x49, 0xbe, 0x5b, + 0x45, 0x65, 0xf4, 0x56, 0xd6, 0xe8, 0xfe, 0x54, 0x0f, 0xdf, 0x4c, 0x81, 0x9c, 0x48, 0x8c, 0x43, + 0x12, 0x26, 0x99, 0xfc, 0x1e, 0xac, 0xb0, 0xd0, 0xe9, 0x12, 0x77, 0x20, 0xf3, 0xe8, 0xf7, 0x5a, + 0x25, 0x35, 0x25, 0xae, 0xb1, 0x70, 0x2f, 0xa1, 0xa1, 0x5b, 0x00, 0x2c, 0x74, 0x04, 0x7b, 0xee, + 0x91, 0xf0, 0x45, 0xab, 0xac, 0x24, 0x6a, 0x2c, 0x3c, 0xd5, 0x84, 0xf6, 0x33, 0xa8, 0x25, 0x89, + 0x42, 0x8f, 0xa0, 0x1e, 0x57, 0x03, 0x77, 0x22, 0x53, 0x59, 0x77, 0xe6, 0xb5, 0x82, 0x12, 0xea, + 0xf8, 0x4c, 0xc8, 0x68, 0x71, 0x8d, 0xc7, 0x10, 0x6d, 0x06, 0x28, 0x9b, 0x21, 0x74, 0x02, 0x1b, + 0x09, 0x70, 0x2a, 0xfd, 0x17, 0x58, 0x98, 0xcd, 0x27, 0x46, 0x3c, 0x03, 0xba, 0x57, 0x83, 0x8a, + 0xa1, 0xda, 0xbf, 0xb5, 0x60, 0x63, 0xb6, 0x4f, 0xae, 0xd6, 0x83, 0xfb, 0x50, 0xe3, 0x46, 0x35, + 0x1e, 0xff, 0x3f, 0x58, 0x52, 0x15, 0x5a, 0x1a, 0x4f, 0xf5, 0xec, 0x5f, 0xe7, 0x67, 0x9a, 0x36, + 0xf1, 0xe5, 0x6d, 0x0b, 0xff, 0x04, 0x50, 0x9f, 0x13, 0x5f, 0xd0, 0x9e, 0x5c, 0x0d, 0x47, 0x48, + 0xc8, 0xd8, 0xab, 0xbb, 0x59, 0xaf, 0x9e, 0x68, 0x59, 0xdc, 0x49, 0xdb, 0x6e, 0xf4, 0x67, 0xa8, + 0xb2, 0x01, 0x6e, 0x24, 0xa0, 0x31, 0x82, 0x41, 0x2e, 0x28, 0xe4, 0x07, 0x8b, 0x91, 0xa7, 0xb9, + 0x4f, 0x9b, 0xb8, 0x1e, 0x9b, 0x48, 0xf3, 0x42, 0xfb, 0xcf, 0x16, 0x6c, 0xcc, 0x73, 0x09, 0x7d, + 0x0c, 0x45, 0x31, 0x19, 0xe9, 0xb8, 0x57, 0x97, 0x54, 0xd7, 0xe9, 0x64, 0x44, 0xb1, 0x12, 0x47, + 0x07, 0xb0, 0x1a, 0x3b, 0x9e, 0x64, 0x62, 0x41, 0x03, 0xa5, 0xbd, 0x5b, 0x31, 0x4a, 0x26, 0xfc, + 0xbb, 0xd0, 0x10, 0x9c, 0xb9, 0x03, 0x8f, 0x3a, 0x82, 0x0d, 0xa9, 0x63, 0x9a, 0xbf, 0x80, 0x57, + 0x0c, 0xf9, 0x94, 0x0d, 0xe9, 0x51, 0x68, 0xff, 0xd5, 0x82, 0x5b, 0x17, 0x86, 0x7d, 0x89, 0x30, + 0x52, 0x7a, 0xdf, 0x55, 0x18, 0x7f, 0xc8, 0x43, 0x3d, 0x35, 0x4e, 0x10, 0x82, 0x12, 0x37, 0xad, + 0x6d, 0xdd, 0xb3, 0x70, 0x81, 0xe3, 0x8e, 0xa4, 0x8d, 0x15, 0x2d, 0xaf, 0x69, 0x63, 0xdc, 0x91, + 0x43, 0x83, 0x53, 0xd2, 0x73, 0xba, 0x13, 0x41, 0x35, 0xb4, 0x25, 0x2b, 0x9c, 0xf4, 0xf6, 0x24, + 0x01, 0xdd, 0x86, 0xfa, 0x98, 0x33, 0x41, 0x0d, 0xbf, 0xa8, 0xf8, 0xa0, 0x48, 0x5a, 0xe0, 0x3e, + 0xac, 0x89, 0x40, 0x10, 0xcf, 0x71, 0x47, 0x51, 0xe2, 0x61, 0x49, 0x89, 0xad, 0x2a, 0xc6, 0xfe, + 0x28, 0xd2, 0x2e, 0xa2, 0x0f, 0xe1, 0x7a, 0x78, 0xe6, 0x39, 0x1e, 0x99, 0x50, 0x3e, 0x23, 0x5e, + 0x56, 0xe2, 0x6b, 0xe1, 0x99, 0x77, 0x28, 0x79, 0x53, 0x8d, 0xfb, 0xb0, 0x36, 0x38, 0x77, 0x94, + 0x7f, 0x7c, 0xe4, 0x3a, 0x6e, 0x10, 0xf9, 0xa2, 0x55, 0xd1, 0xe0, 0x83, 0x73, 0x4c, 0x49, 0x0f, + 0x8f, 0xdc, 0x7d, 0x49, 0x45, 0xef, 0x03, 0x1a, 0x9c, 0x3b, 0xda, 0xd7, 0xa9, 0x6c, 0x55, 0xc9, + 0x36, 0x06, 0xe7, 0x5f, 0x4b, 0x46, 0x2c, 0x6c, 0x7f, 0x03, 0x8d, 0x37, 0x06, 0xdb, 0x55, 0x6b, + 0x75, 0x03, 0x4a, 0xe7, 0xc4, 0x8b, 0xa8, 0x49, 0xa9, 0xfe, 0x51, 0xf8, 0xb3, 0x63, 0xed, 0xaa, + 0x45, 0x34, 0x1f, 0xff, 0xbf, 0x05, 0x58, 0x99, 0x39, 0x89, 0xc8, 0x23, 0x45, 0x6a, 0xc4, 0xa8, + 0x6f, 0xf4, 0x00, 0x8a, 0xc3, 0xa0, 0xa7, 0x55, 0x57, 0x77, 0x6e, 0xce, 0xeb, 0xf6, 0x20, 0x1a, + 0x1d, 0x05, 0x3d, 0x8a, 0x95, 0x20, 0x3a, 0x84, 0x6b, 0x72, 0xfc, 0x84, 0x54, 0x08, 0xe6, 0xf7, + 0xe3, 0xcd, 0x72, 0x6b, 0x81, 0x62, 0x2a, 0x21, 0x27, 0x46, 0x03, 0x03, 0xef, 0xc4, 0xdf, 0xe8, + 0x1b, 0xb8, 0x3e, 0xb3, 0x01, 0x27, 0xb0, 0xc5, 0x8b, 0x61, 0xa7, 0x79, 0x48, 0x60, 0xd7, 0x79, + 0x96, 0x88, 0xda, 0x50, 0x1d, 0x71, 0x16, 0x70, 0x26, 0x26, 0xaa, 0xe0, 0x56, 0x70, 0xf2, 0x8f, + 0x0e, 0xa1, 0xc9, 0x23, 0x9f, 0x8c, 0xc9, 0x64, 0x6a, 0xb6, 0xac, 0xcc, 0xce, 0xcb, 0xbc, 0x96, + 0x4c, 0xac, 0x35, 0xf8, 0x2c, 0x01, 0x75, 0x60, 0x7d, 0xba, 0xf5, 0x4e, 0x01, 0x2b, 0x0a, 0x70, + 0xce, 0x71, 0x6c, 0xba, 0x27, 0x27, 0x98, 0xa8, 0x9b, 0xa1, 0xa1, 0x5d, 0xa8, 0xe0, 0x8e, 0x3a, + 0xe1, 0xab, 0x3a, 0x5d, 0x7a, 0x42, 0x88, 0xa5, 0xed, 0x9f, 0x43, 0x6b, 0xd1, 0x0a, 0xa0, 0x6d, + 0x28, 0xc4, 0x5d, 0xbf, 0x74, 0xd4, 0xe4, 0x79, 0xc7, 0xfe, 0x8b, 0x15, 0x83, 0xcd, 0x49, 0xf1, + 0x03, 0x28, 0xb8, 0xa3, 0x4b, 0x82, 0x49, 0x49, 0xf4, 0x09, 0x54, 0x58, 0xa0, 0x1a, 0xf6, 0x72, + 0xc3, 0xae, 0xcc, 0x02, 0xd9, 0xc5, 0xe8, 0xc7, 0x50, 0x65, 0x81, 0xee, 0x5e, 0x53, 0x75, 0x4b, + 0x14, 0x2b, 0x2c, 0x50, 0x2d, 0x6d, 0xf7, 0xa1, 0x9e, 0x9e, 0xd5, 0x9f, 0x41, 0x35, 0x59, 0x1f, + 0x6b, 0xd1, 0xfa, 0x28, 0x85, 0x43, 0x36, 0x4c, 0x15, 0x6e, 0xa2, 0x85, 0xde, 0x81, 0x72, 0x6a, + 0x5c, 0x5b, 0xd8, 0xfc, 0xd9, 0x67, 0xe6, 0x88, 0x3b, 0xa3, 0x87, 0x6e, 0x42, 0xed, 0x39, 0xf3, + 0x3c, 0x87, 0x13, 0xa1, 0x9b, 0xaf, 0x88, 0xab, 0x92, 0x80, 0x89, 0xa0, 0x72, 0x78, 0x76, 0x23, + 0x1e, 0x0a, 0xc7, 0x93, 0x3a, 0x0a, 0xaf, 0x80, 0x41, 0x91, 0x14, 0x8a, 0x1c, 0xbe, 0x43, 0xf2, + 0x6a, 0xba, 0x2b, 0xab, 0xe1, 0x3b, 0x24, 0xaf, 0xcc, 0xc6, 0x7a, 0x07, 0x4a, 0xea, 0xcc, 0x82, + 0x5a, 0x50, 0x19, 0xd2, 0x30, 0x24, 0xfd, 0xb8, 0xc1, 0xe3, 0x5f, 0xfb, 0x53, 0xa8, 0x9b, 0xf2, + 0xc5, 0x91, 0x27, 0x5b, 0x7e, 0x83, 0xbe, 0xa2, 0xae, 0x43, 0x3d, 0x32, 0x0a, 0xe5, 0xc6, 0x63, + 0x26, 0xac, 0xf6, 0x6c, 0x4d, 0xf2, 0x1e, 0x6b, 0x96, 0xd9, 0x36, 0x38, 0x34, 0x8c, 0xfe, 0x23, + 0x57, 0x16, 0xd9, 0x57, 0x3b, 0xe8, 0xa3, 0x99, 0x49, 0x75, 0x7b, 0x61, 0xbf, 0x68, 0x05, 0x33, + 0xa7, 0xb6, 0x60, 0x2d, 0x1c, 0x33, 0xe1, 0xbe, 0x48, 0x9f, 0x77, 0xf4, 0xfd, 0xa6, 0xa1, 0x19, + 0xd3, 0xdb, 0xdf, 0x39, 0x5c, 0x33, 0x10, 0x5f, 0x13, 0xe1, 0xbe, 0x90, 0xa7, 0x25, 0x79, 0x5c, + 0x66, 0x7e, 0xdf, 0xe9, 0x45, 0x9c, 0xa8, 0x53, 0xb4, 0xf1, 0xb9, 0x80, 0xd7, 0x0c, 0xeb, 0xc0, + 0x70, 0x8e, 0x42, 0xf4, 0x89, 0x71, 0x50, 0xcf, 0x35, 0x7b, 0xa1, 0x83, 0x0a, 0x7d, 0x3a, 0x4b, + 0xed, 0xff, 0x58, 0x49, 0xb0, 0xc9, 0xfa, 0x3d, 0x84, 0x22, 0x8f, 0x3c, 0xba, 0xb8, 0xc4, 0x53, + 0xd9, 0xc5, 0x4a, 0x14, 0xed, 0x42, 0x99, 0xa8, 0xd0, 0x8d, 0x03, 0x4b, 0x33, 0x64, 0xc4, 0xd1, + 0x8f, 0xa0, 0x34, 0x96, 0x2e, 0x99, 0x0a, 0xdf, 0xbc, 0xd8, 0x71, 0xac, 0x85, 0xd1, 0xa7, 0x50, + 0xd3, 0xfa, 0xce, 0xf9, 0x8e, 0x19, 0x9d, 0x77, 0x96, 0x58, 0xfc, 0x6a, 0x07, 0x57, 0x89, 0xf9, + 0xb2, 0x1f, 0x02, 0xca, 0xce, 0x23, 0x59, 0xb7, 0x2f, 0x83, 0xae, 0x23, 0xf3, 0xa2, 0xef, 0x95, + 0x35, 0x5c, 0x7d, 0x19, 0x74, 0x65, 0xb6, 0x42, 0x1b, 0x43, 0xfd, 0x98, 0x70, 0xc1, 0x5c, 0x36, + 0x22, 0xbe, 0x98, 0xbb, 0xb7, 0xac, 0x42, 0x9e, 0xf5, 0xcc, 0xf5, 0x31, 0xcf, 0x7a, 0xb2, 0xd4, + 0x3d, 0x16, 0x0a, 0xea, 0x3b, 0x11, 0xf7, 0xf4, 0x01, 0xb3, 0x86, 0x41, 0x93, 0x3a, 0xdc, 0x0b, + 0xb7, 0xde, 0x9d, 0xd9, 0x72, 0xa5, 0x1d, 0x54, 0x86, 0x3c, 0xee, 0x34, 0x73, 0x5b, 0x3f, 0x99, + 0xd9, 0x2d, 0x15, 0xab, 0x02, 0x85, 0xfd, 0xe3, 0x4e, 0x33, 0x87, 0x56, 0x01, 0x9e, 0x7e, 0x29, + 0x47, 0xc4, 0xcf, 0xbc, 0x60, 0xdc, 0xb4, 0x50, 0x03, 0xea, 0x4f, 0xbf, 0x54, 0x9d, 0xaf, 0x08, + 0xf9, 0xad, 0x87, 0x50, 0x4b, 0xb6, 0x31, 0x54, 0x87, 0x4a, 0xc7, 0x1f, 0xf8, 0xc1, 0xd8, 0x6f, + 0xe6, 0x10, 0x40, 0x19, 0x77, 0x24, 0xb9, 0x69, 0x49, 0x06, 0x26, 0x63, 0xf5, 0x93, 0xdf, 0x3a, + 0x85, 0x95, 0x99, 0x74, 0x49, 0x23, 0xcf, 0x02, 0x9f, 0xea, 0x3f, 0xad, 0x79, 0xc0, 0x27, 0x38, + 0xf2, 0x9b, 0x16, 0xba, 0x06, 0xd5, 0xfd, 0x20, 0xf0, 0x0e, 0x24, 0x66, 0x1e, 0x55, 0xa1, 0xf8, + 0x05, 0xf3, 0xbc, 0x66, 0x41, 0x3a, 0x72, 0x32, 0xad, 0xeb, 0x66, 0x71, 0x6b, 0x1f, 0x9a, 0x6f, + 0xd6, 0x1d, 0x5a, 0x81, 0x9a, 0x04, 0x56, 0x84, 0x66, 0x0e, 0xd5, 0xa0, 0xf4, 0xf8, 0x15, 0x71, + 0x85, 0x76, 0xe8, 0x84, 0x0d, 0x99, 0x47, 0xb8, 0x46, 0x3d, 0xf6, 0x88, 0xdf, 0x2c, 0xec, 0xfc, + 0xb1, 0x24, 0xd3, 0xa4, 0x13, 0x71, 0xa4, 0x97, 0x16, 0x9d, 0x01, 0xca, 0x3e, 0x79, 0xa1, 0xf7, + 0xb3, 0x35, 0xb0, 0xf0, 0x69, 0xad, 0xfd, 0xc3, 0xcb, 0x09, 0xeb, 0xdb, 0x8b, 0x9d, 0x43, 0x03, + 0x68, 0xbe, 0xf9, 0xde, 0x84, 0xee, 0xcf, 0xd9, 0xaf, 0xe7, 0xbf, 0x81, 0xb5, 0xb7, 0x2e, 0x23, + 0x9a, 0x36, 0xf6, 0xa8, 0xd7, 0x5b, 0x6a, 0x6c, 0xc1, 0x73, 0xce, 0x3c, 0x63, 0x8b, 0xde, 0x69, + 0xec, 0x1c, 0xf2, 0x61, 0xfd, 0x28, 0xe8, 0xb1, 0xe7, 0x93, 0xff, 0x93, 0x3d, 0x01, 0xeb, 0x73, + 0x5e, 0xba, 0xd0, 0x9c, 0x05, 0x59, 0xfc, 0xbc, 0xd6, 0xfe, 0xe0, 0x92, 0xd2, 0x89, 0xd5, 0x97, + 0xb0, 0xfe, 0xc8, 0x3d, 0x8b, 0x18, 0x4f, 0xdf, 0x63, 0x42, 0x74, 0xf1, 0x05, 0x37, 0xa9, 0x96, + 0xbb, 0xcb, 0xc4, 0x62, 0x3b, 0xf7, 0xac, 0x0f, 0xad, 0xbd, 0x8d, 0x7f, 0xfc, 0xbe, 0x6a, 0xfd, + 0xed, 0xf5, 0xa6, 0xf5, 0xf7, 0xd7, 0x9b, 0xd6, 0x3f, 0x5f, 0x6f, 0x5a, 0xbf, 0xfb, 0xd7, 0x66, + 0xae, 0x5b, 0x56, 0x0f, 0xbe, 0x1f, 0xfd, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x8e, 0x35, 0x7e, 0x33, + 0x43, 0x16, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3762,6 +3837,45 @@ func (m *RunawayRule) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *RunawayActionV2) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *RunawayActionV2) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RunawayActionV2) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.SwitchGroupName) > 0 { + i -= len(m.SwitchGroupName) + copy(dAtA[i:], m.SwitchGroupName) + i = encodeVarintResourceManager(dAtA, i, uint64(len(m.SwitchGroupName))) + i-- + dAtA[i] = 0x12 + } + if m.Type != 0 { + i = encodeVarintResourceManager(dAtA, i, uint64(m.Type)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + func (m *RunawayWatch) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -3823,6 +3937,18 @@ func (m *RunawaySettings) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if m.ActionV2 != nil { + { + size, err := m.ActionV2.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintResourceManager(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } if m.Watch != nil { { size, err := m.Watch.MarshalToSizedBuffer(dAtA[:i]) @@ -4530,6 +4656,25 @@ func (m *RunawayRule) Size() (n int) { return n } +func (m *RunawayActionV2) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Type != 0 { + n += 1 + sovResourceManager(uint64(m.Type)) + } + l = len(m.SwitchGroupName) + if l > 0 { + n += 1 + l + sovResourceManager(uint64(l)) + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + func (m *RunawayWatch) Size() (n int) { if m == nil { return 0 @@ -4565,6 +4710,10 @@ func (m *RunawaySettings) Size() (n int) { l = m.Watch.Size() n += 1 + l + sovResourceManager(uint64(l)) } + if m.ActionV2 != nil { + l = m.ActionV2.Size() + n += 1 + l + sovResourceManager(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -7689,6 +7838,108 @@ func (m *RunawayRule) Unmarshal(dAtA []byte) error { } return nil } +func (m *RunawayActionV2) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowResourceManager + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: RunawayActionV2: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: RunawayActionV2: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Type", wireType) + } + m.Type = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowResourceManager + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Type |= RunawayAction(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SwitchGroupName", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowResourceManager + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthResourceManager + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthResourceManager + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.SwitchGroupName = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipResourceManager(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthResourceManager + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *RunawayWatch) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -7898,6 +8149,42 @@ func (m *RunawaySettings) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ActionV2", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowResourceManager + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthResourceManager + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthResourceManager + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.ActionV2 == nil { + m.ActionV2 = &RunawayActionV2{} + } + if err := m.ActionV2.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipResourceManager(dAtA[iNdEx:]) diff --git a/proto/resource_manager.proto b/proto/resource_manager.proto index e6077d2c0..25848b797 100644 --- a/proto/resource_manager.proto +++ b/proto/resource_manager.proto @@ -196,9 +196,10 @@ message Error { enum RunawayAction { NoneAction = 0; - DryRun = 1; // do nothing - CoolDown = 2; // deprioritize the task - Kill = 3; // kill the task + DryRun = 1; // do nothing + CoolDown = 2; // deprioritize the task + Kill = 3; // kill the task + SwitchGroup = 4; // switch the task to another group } enum RunawayWatchType { @@ -212,6 +213,14 @@ message RunawayRule { uint64 exec_elapsed_time_ms = 1; } +// RunawayActionV2 is the new version of RunawayAction, which is designed to +// provide better extensibility with different types of actions. +message RunawayActionV2 { + RunawayAction type = 1; + string switch_group_name = 2; +} + +// DEPRECATED: please use `RunawayActionV2` instead to obtain better extensibility. message RunawayWatch { // how long would the watch last int64 lasting_duration_ms = 1; @@ -219,9 +228,11 @@ message RunawayWatch { } message RunawaySettings { - RunawayRule rule = 1; + RunawayRule rule = 1; + // DEPRECATED: please use `action_v2` instead to obtain better extensibility. RunawayAction action = 2; RunawayWatch watch = 3; + RunawayActionV2 action_v2 = 4; } message BackgroundSettings { diff --git a/scripts/proto.lock b/scripts/proto.lock index 44407517a..38323da35 100644 --- a/scripts/proto.lock +++ b/scripts/proto.lock @@ -18761,6 +18761,10 @@ { "name": "Kill", "integer": 3 + }, + { + "name": "SwitchGroup", + "integer": 4 } ] }, @@ -19257,6 +19261,21 @@ } ] }, + { + "name": "RunawayActionV2", + "fields": [ + { + "id": 1, + "name": "type", + "type": "RunawayAction" + }, + { + "id": 2, + "name": "switch_group_name", + "type": "string" + } + ] + }, { "name": "RunawayWatch", "fields": [ @@ -19289,6 +19308,11 @@ "id": 3, "name": "watch", "type": "RunawayWatch" + }, + { + "id": 4, + "name": "action_v2", + "type": "RunawayActionV2" } ] },