From 57d149d18b9fec6185875f6907dd2202cc6e8331 Mon Sep 17 00:00:00 2001 From: GLYASAI Date: Tue, 24 Nov 2020 21:09:52 +0800 Subject: [PATCH 1/3] update app status --- worker/appm/store/store.go | 39 ++- worker/appm/types/v1/status.go | 2 - worker/server/pb/app_runtime_server.pb.go | 301 +++++++++++----------- worker/server/pb/app_runtime_server.proto | 3 +- 4 files changed, 182 insertions(+), 163 deletions(-) diff --git a/worker/appm/store/store.go b/worker/appm/store/store.go index 9710bfbf4..dd456ad50 100644 --- a/worker/appm/store/store.go +++ b/worker/appm/store/store.go @@ -1046,8 +1046,10 @@ func (a *appRuntimeStore) GetAppStatus(appID string) (pb.AppStatus_Status, error appStatus = pb.AppStatus_CLOSED case appAbnormal(serviceStatuses): appStatus = pb.AppStatus_ABNORMAL - case appPartialAbnormal(serviceStatuses): - appStatus = pb.AppStatus_PARTIAL_ABNORMAL + case appStarting(serviceStatuses): + appStatus = pb.AppStatus_STARTING + case appStopping(serviceStatuses): + appStatus = pb.AppStatus_STOPPING case appRunning(serviceStatuses): appStatus = pb.AppStatus_RUNNING } @@ -1065,15 +1067,6 @@ func appClosed(statuses map[string]string) bool { } func appAbnormal(statuses map[string]string) bool { - for _, status := range statuses { - if status != v1.ABNORMAL { - return false - } - } - return true -} - -func appPartialAbnormal(statuses map[string]string) bool { for _, status := range statuses { if status == v1.ABNORMAL { return true @@ -1082,6 +1075,30 @@ func appPartialAbnormal(statuses map[string]string) bool { return false } +func appStarting(statuses map[string]string) bool { + for _, status := range statuses { + if status == v1.STARTING { + return true + } + } + return false +} + +func appStopping(statuses map[string]string) bool { + stopping := false + for _, status := range statuses { + if status == v1.STOPPING { + stopping = true + continue + } + if status == v1.CLOSED { + continue + } + return false + } + return stopping +} + func appRunning(statuses map[string]string) bool { for _, status := range statuses { if status == v1.RUNNING { diff --git a/worker/appm/types/v1/status.go b/worker/appm/types/v1/status.go index 975e9a1f5..a7692aafe 100644 --- a/worker/appm/types/v1/status.go +++ b/worker/appm/types/v1/status.go @@ -86,8 +86,6 @@ var ( BUILDEFAILURE = "build_failure" //UNDEPLOY init status UNDEPLOY = "undeploy" - //WAITTING wait depend service start - WAITTING = "waitting" ) //GetServiceStatus get service status diff --git a/worker/server/pb/app_runtime_server.pb.go b/worker/server/pb/app_runtime_server.pb.go index 9ae337f08..3a117b966 100644 --- a/worker/server/pb/app_runtime_server.pb.go +++ b/worker/server/pb/app_runtime_server.pb.go @@ -115,11 +115,12 @@ func (PodStatus_Type) EnumDescriptor() ([]byte, []int) { type AppStatus_Status int32 const ( - AppStatus_NIL AppStatus_Status = 0 - AppStatus_RUNNING AppStatus_Status = 1 - AppStatus_CLOSED AppStatus_Status = 2 - AppStatus_ABNORMAL AppStatus_Status = 3 - AppStatus_PARTIAL_ABNORMAL AppStatus_Status = 4 + AppStatus_NIL AppStatus_Status = 0 + AppStatus_RUNNING AppStatus_Status = 1 + AppStatus_CLOSED AppStatus_Status = 2 + AppStatus_ABNORMAL AppStatus_Status = 3 + AppStatus_STARTING AppStatus_Status = 4 + AppStatus_STOPPING AppStatus_Status = 5 ) var AppStatus_Status_name = map[int32]string{ @@ -127,15 +128,17 @@ var AppStatus_Status_name = map[int32]string{ 1: "RUNNING", 2: "CLOSED", 3: "ABNORMAL", - 4: "PARTIAL_ABNORMAL", + 4: "STARTING", + 5: "STOPPING", } var AppStatus_Status_value = map[string]int32{ - "NIL": 0, - "RUNNING": 1, - "CLOSED": 2, - "ABNORMAL": 3, - "PARTIAL_ABNORMAL": 4, + "NIL": 0, + "RUNNING": 1, + "CLOSED": 2, + "ABNORMAL": 3, + "STARTING": 4, + "STOPPING": 5, } func (x AppStatus_Status) String() string { @@ -1994,146 +1997,146 @@ func init() { } var fileDescriptor_f94cf1a886c479d6 = []byte{ - // 2209 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0x4b, 0x73, 0x1b, 0xc7, - 0x11, 0x26, 0x00, 0xe2, 0xd5, 0x20, 0x40, 0x70, 0xc4, 0x07, 0x04, 0x5b, 0x16, 0xbd, 0x91, 0x54, - 0x2a, 0x49, 0x81, 0x6d, 0xc6, 0x2a, 0x4b, 0xb6, 0xe2, 0x14, 0x08, 0xc0, 0x14, 0x12, 0x10, 0x44, - 0x2d, 0xc0, 0xa4, 0x5c, 0x95, 0x2a, 0xd4, 0x12, 0x3b, 0xa6, 0x37, 0xda, 0xc7, 0x68, 0x1f, 0x74, - 0x70, 0x4c, 0x6e, 0x39, 0xe7, 0x27, 0xe4, 0x90, 0x43, 0x72, 0x4b, 0xce, 0xfe, 0x0b, 0xf9, 0x29, - 0xbe, 0xe4, 0x07, 0xa4, 0x7a, 0x66, 0xf6, 0x05, 0x2c, 0xc5, 0x30, 0x95, 0x54, 0x6e, 0x3b, 0x3d, - 0xfd, 0x4d, 0xf7, 0xf4, 0xf4, 0xf4, 0x63, 0x16, 0x5a, 0x1a, 0x63, 0x73, 0x37, 0xb0, 0x7d, 0xc3, - 0xa2, 0x73, 0x8f, 0xba, 0x57, 0xd4, 0xed, 0x30, 0xd7, 0xf1, 0x1d, 0x92, 0x67, 0x17, 0x4a, 0x19, - 0x8a, 0x03, 0x8b, 0xf9, 0x4b, 0xe5, 0x21, 0x6c, 0x75, 0x19, 0x9b, 0xfa, 0x9a, 0x1f, 0x78, 0x2a, - 0x7d, 0x4b, 0xf6, 0xa0, 0x84, 0x40, 0x43, 0x6f, 0xe5, 0x0e, 0x73, 0x8f, 0xab, 0x6a, 0x51, 0x63, - 0x6c, 0xa8, 0x2b, 0x1f, 0x41, 0x63, 0x4a, 0xdd, 0x2b, 0x63, 0x41, 0x55, 0xfa, 0x36, 0xa0, 0x9e, - 0x4f, 0xee, 0x01, 0x78, 0x82, 0x12, 0x33, 0x57, 0x25, 0x65, 0xa8, 0x2b, 0x47, 0xb0, 0x2d, 0x01, - 0x5e, 0x88, 0xb8, 0x0f, 0xb5, 0x18, 0xe1, 0x49, 0x08, 0x44, 0x10, 0x4f, 0x79, 0x06, 0xf5, 0x19, - 0xb5, 0x35, 0xdb, 0x0f, 0x11, 0xef, 0x41, 0xd5, 0xe7, 0x84, 0x58, 0x44, 0x45, 0x10, 0x86, 0xba, - 0xf2, 0xbb, 0x1c, 0xd4, 0x85, 0xde, 0xa7, 0xd4, 0xf3, 0xb4, 0x4b, 0x4a, 0x9e, 0x43, 0xc9, 0xe3, - 0x84, 0x56, 0xee, 0xb0, 0xf0, 0xb8, 0x76, 0x74, 0xaf, 0xc3, 0x2e, 0x3a, 0x29, 0x16, 0x39, 0x1a, - 0xd8, 0xbe, 0xbb, 0x54, 0x25, 0x73, 0xfb, 0x25, 0xd4, 0x12, 0x64, 0xd2, 0x84, 0xc2, 0x1b, 0xba, - 0x94, 0xe2, 0xf0, 0x93, 0xec, 0x42, 0xf1, 0x4a, 0x33, 0x03, 0xda, 0xca, 0x0b, 0x93, 0xf0, 0xc1, + // 2210 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x19, 0xcb, 0x72, 0x1b, 0xc7, + 0x91, 0x00, 0x88, 0x57, 0x83, 0x00, 0xc1, 0x11, 0x1f, 0x10, 0x6c, 0x59, 0xf4, 0x46, 0x52, 0xa9, + 0x24, 0x05, 0xb6, 0x19, 0xab, 0x2c, 0xd9, 0x8a, 0x53, 0x20, 0x00, 0x53, 0x48, 0x40, 0x10, 0xb5, + 0x00, 0x93, 0x72, 0x55, 0xaa, 0x50, 0x4b, 0xec, 0x98, 0xde, 0x68, 0x1f, 0xa3, 0x7d, 0xd0, 0xc1, + 0x31, 0xb9, 0xe5, 0x9c, 0x4f, 0xc8, 0x21, 0x87, 0xe4, 0x98, 0x4b, 0x2e, 0xfe, 0x85, 0x7c, 0x8a, + 0x2f, 0xf9, 0x80, 0x54, 0xcf, 0xcc, 0xbe, 0x80, 0xa5, 0x18, 0xa6, 0x92, 0xca, 0x6d, 0xbb, 0xa7, + 0x7b, 0xba, 0xa7, 0xbb, 0xa7, 0x1f, 0xb3, 0xd0, 0xd2, 0x18, 0x9b, 0xbb, 0x81, 0xed, 0x1b, 0x16, + 0x9d, 0x7b, 0xd4, 0xbd, 0xa2, 0x6e, 0x87, 0xb9, 0x8e, 0xef, 0x90, 0x3c, 0xbb, 0x50, 0xca, 0x50, + 0x1c, 0x58, 0xcc, 0x5f, 0x2a, 0x0f, 0x61, 0xab, 0xcb, 0xd8, 0xd4, 0xd7, 0xfc, 0xc0, 0x53, 0xe9, + 0x5b, 0xb2, 0x07, 0x25, 0x64, 0x34, 0xf4, 0x56, 0xee, 0x30, 0xf7, 0xb8, 0xaa, 0x16, 0x35, 0xc6, + 0x86, 0xba, 0xf2, 0x11, 0x34, 0xa6, 0xd4, 0xbd, 0x32, 0x16, 0x54, 0xa5, 0x6f, 0x03, 0xea, 0xf9, + 0xe4, 0x1e, 0x80, 0x27, 0x30, 0x31, 0x71, 0x55, 0x62, 0x86, 0xba, 0x72, 0x04, 0xdb, 0x92, 0xc1, + 0x0b, 0x39, 0xee, 0x43, 0x2d, 0xe6, 0xf0, 0x24, 0x0b, 0x44, 0x2c, 0x9e, 0xf2, 0x0c, 0xea, 0x33, + 0x6a, 0x6b, 0xb6, 0x1f, 0x72, 0xbc, 0x07, 0x55, 0x9f, 0x23, 0x62, 0x11, 0x15, 0x81, 0x18, 0xea, + 0xca, 0xef, 0x72, 0x50, 0x17, 0x7a, 0x9f, 0x52, 0xcf, 0xd3, 0x2e, 0x29, 0x79, 0x0e, 0x25, 0x8f, + 0x23, 0x5a, 0xb9, 0xc3, 0xc2, 0xe3, 0xda, 0xd1, 0xbd, 0x0e, 0xbb, 0xe8, 0xa4, 0x48, 0x24, 0x34, + 0xb0, 0x7d, 0x77, 0xa9, 0x4a, 0xe2, 0xf6, 0x4b, 0xa8, 0x25, 0xd0, 0xa4, 0x09, 0x85, 0x37, 0x74, + 0x29, 0xc5, 0xe1, 0x27, 0xd9, 0x85, 0xe2, 0x95, 0x66, 0x06, 0xb4, 0x95, 0x17, 0x26, 0xe1, 0xc0, 0xe7, 0xf9, 0x17, 0x39, 0x65, 0x09, 0xb5, 0xbe, 0xe1, 0xbd, 0x09, 0x15, 0xf8, 0x18, 0x8a, 0xba, - 0xe1, 0xbd, 0x09, 0xe5, 0xb7, 0x51, 0x7e, 0x62, 0x9e, 0x7f, 0x4b, 0xe1, 0x82, 0xb1, 0xfd, 0x02, - 0x20, 0x26, 0xde, 0x24, 0x3a, 0x97, 0x14, 0x6d, 0xc1, 0x8e, 0x34, 0x70, 0x97, 0xb1, 0x89, 0xa3, + 0xe1, 0xbd, 0x09, 0xe5, 0xb7, 0x51, 0x7e, 0x62, 0x9d, 0x7f, 0x4b, 0xe1, 0x82, 0xb0, 0xfd, 0x02, + 0x20, 0x46, 0xde, 0x24, 0x3a, 0x97, 0x14, 0x6d, 0xc1, 0x8e, 0x34, 0x70, 0x97, 0xb1, 0x89, 0xa3, 0x8f, 0x0c, 0xcf, 0x27, 0x4f, 0xa1, 0xec, 0x98, 0xfa, 0xc4, 0xd1, 0x43, 0x15, 0x76, 0xb8, 0x09, - 0x92, 0x7c, 0x6a, 0xc8, 0x81, 0xcc, 0x36, 0xfd, 0x8e, 0x33, 0xe7, 0xaf, 0x65, 0x96, 0x1c, 0xca, - 0xf7, 0x39, 0xd8, 0x3f, 0x0d, 0x4c, 0xdf, 0x58, 0x17, 0x7a, 0x1a, 0x9d, 0x6b, 0x42, 0xf0, 0x53, - 0x5c, 0x2b, 0x1b, 0x10, 0x8a, 0x40, 0x6e, 0x61, 0x8c, 0x24, 0xbe, 0x7d, 0x0e, 0xcd, 0x55, 0x86, - 0x0c, 0xc3, 0x3c, 0x4d, 0x1a, 0xa6, 0x76, 0xb4, 0xb7, 0xa6, 0x3a, 0x4a, 0x4a, 0xda, 0xeb, 0x87, - 0x3c, 0xd4, 0x53, 0x0c, 0x37, 0x78, 0x30, 0x3a, 0x9f, 0x4e, 0x99, 0xe9, 0x2c, 0x71, 0x56, 0x9c, - 0x7c, 0x45, 0x10, 0x86, 0x3a, 0xfa, 0xb2, 0x9c, 0xf4, 0x97, 0x8c, 0xb6, 0x0a, 0xc2, 0x97, 0x05, - 0x69, 0xb6, 0x64, 0x94, 0xdc, 0x85, 0x0a, 0x73, 0xf4, 0xb9, 0xad, 0x59, 0xb4, 0xb5, 0xc9, 0x67, - 0xcb, 0xcc, 0xd1, 0xc7, 0x9a, 0x45, 0xf1, 0x8a, 0xe1, 0x94, 0xc1, 0x5a, 0x45, 0xe1, 0x4f, 0xcc, - 0xd1, 0x87, 0x0c, 0xd5, 0x41, 0xb2, 0xf4, 0xe0, 0x92, 0x50, 0x87, 0x39, 0xba, 0xf0, 0x4d, 0xd2, - 0x05, 0x58, 0x38, 0xb6, 0xaf, 0x19, 0x36, 0x75, 0xbd, 0x56, 0x99, 0x1b, 0xf9, 0xc3, 0xb5, 0x5d, - 0x77, 0x7a, 0x11, 0x8f, 0x30, 0x6d, 0x02, 0x84, 0x4a, 0xa3, 0x84, 0x2b, 0xc7, 0x0c, 0x2c, 0xea, - 0xb5, 0x2a, 0x87, 0x05, 0x54, 0x9a, 0x39, 0xfa, 0x2f, 0x05, 0xa5, 0x3d, 0x82, 0xed, 0x15, 0x7c, - 0x86, 0xe5, 0x7f, 0x94, 0xb6, 0x7c, 0x1d, 0x75, 0x88, 0x50, 0x49, 0x8b, 0x9f, 0x43, 0x35, 0xa2, - 0x93, 0x87, 0xd0, 0x88, 0x34, 0x11, 0x56, 0x11, 0x4b, 0xd6, 0x23, 0x2a, 0xb7, 0xcd, 0x87, 0xb0, - 0x65, 0x51, 0xcb, 0x71, 0x97, 0x73, 0xd3, 0xb0, 0x0c, 0x9f, 0xcb, 0x28, 0xa8, 0x35, 0x41, 0x1b, - 0x21, 0x49, 0xf9, 0xa1, 0x04, 0xd0, 0x17, 0xe7, 0x60, 0x7f, 0xe3, 0x90, 0xf7, 0xa1, 0x8a, 0xcb, - 0x79, 0x4c, 0x5b, 0x84, 0x6b, 0xc6, 0x04, 0xa2, 0xc0, 0x16, 0x1a, 0x94, 0x7e, 0x13, 0x98, 0xd4, - 0xa3, 0xbe, 0x3c, 0xc7, 0x14, 0x8d, 0x7c, 0x00, 0xf2, 0xe0, 0x2c, 0x6a, 0xfb, 0xe9, 0xa3, 0x44, - 0x0a, 0xf7, 0x13, 0x5f, 0x73, 0xfd, 0x39, 0x86, 0x52, 0x79, 0x98, 0x55, 0x4e, 0x99, 0x19, 0x16, - 0x25, 0xcf, 0x60, 0x93, 0xa1, 0xdf, 0x17, 0xf9, 0x91, 0xb4, 0xf8, 0x9d, 0x8f, 0xd4, 0xeb, 0xc4, - 0x4e, 0xce, 0xb9, 0xc8, 0x0b, 0xa8, 0x48, 0x17, 0xc3, 0x33, 0x46, 0xc4, 0xfb, 0x2b, 0x88, 0x30, - 0x6c, 0x0a, 0x54, 0xc4, 0x4d, 0xbe, 0x80, 0x2a, 0xb5, 0x75, 0xe6, 0x18, 0xb6, 0x1f, 0x9e, 0xff, - 0xbd, 0x15, 0xe8, 0x20, 0x9c, 0x17, 0xd8, 0x98, 0x9f, 0x3c, 0x87, 0xb2, 0x47, 0x17, 0x2e, 0xf5, - 0xc5, 0xb1, 0xd7, 0x8e, 0xde, 0x5b, 0x93, 0xca, 0x67, 0x05, 0x30, 0xe4, 0x45, 0x99, 0x86, 0x7d, - 0xe9, 0x52, 0xcf, 0xa3, 0x5e, 0xab, 0x9a, 0x29, 0x73, 0x18, 0xce, 0x4b, 0x99, 0x11, 0x3f, 0xe9, - 0x42, 0xcd, 0xa5, 0xcc, 0x34, 0x16, 0x9a, 0x8f, 0xa6, 0x07, 0x0e, 0xbf, 0xbf, 0x02, 0x57, 0x63, - 0x0e, 0x19, 0x0b, 0x12, 0x18, 0xb2, 0x1f, 0x45, 0xf4, 0x1a, 0x37, 0x7b, 0x18, 0xb2, 0x3f, 0x83, - 0xea, 0xbb, 0x82, 0xc3, 0xb5, 0x01, 0xbb, 0xfd, 0x45, 0x14, 0x04, 0xfe, 0x03, 0xf0, 0x2b, 0x68, - 0xa4, 0x2d, 0x7c, 0x2b, 0xf4, 0xe7, 0xb0, 0x95, 0x34, 0xf2, 0x6d, 0x25, 0xa7, 0xed, 0x7c, 0x2b, - 0xf4, 0x97, 0xd0, 0x5c, 0x35, 0xf3, 0xad, 0xb2, 0xdc, 0x5f, 0xf3, 0xd0, 0x08, 0x13, 0xb3, 0xe7, - 0x04, 0xee, 0x82, 0x62, 0x28, 0x59, 0xb0, 0x60, 0xee, 0x8a, 0x44, 0xcd, 0x97, 0x29, 0xa8, 0xb0, - 0x60, 0x41, 0x22, 0x75, 0x23, 0x43, 0xf2, 0x16, 0x57, 0x16, 0x2c, 0xe0, 0x57, 0x18, 0x83, 0x81, - 0xbc, 0xe5, 0xe1, 0x02, 0x05, 0xce, 0x51, 0x17, 0xd4, 0x70, 0x8d, 0xd5, 0x60, 0xb0, 0xb9, 0x16, - 0x0c, 0xc8, 0x23, 0xd8, 0x76, 0x03, 0xdb, 0x36, 0xec, 0xcb, 0x39, 0x96, 0x2d, 0x76, 0x60, 0xf1, - 0xa0, 0x5a, 0x50, 0xeb, 0x92, 0xdc, 0x65, 0x6c, 0x1c, 0x58, 0xe4, 0x13, 0xd8, 0x4b, 0xf2, 0xf9, - 0xdf, 0x1a, 0xae, 0xce, 0xb9, 0x81, 0x73, 0x93, 0x98, 0x7b, 0x86, 0x53, 0x08, 0xf9, 0x0c, 0x5a, - 0x49, 0x88, 0x61, 0xfb, 0xd4, 0xb5, 0x35, 0x93, 0xa3, 0x6a, 0x1c, 0xb5, 0x17, 0xa3, 0x86, 0x72, - 0x76, 0x1c, 0x58, 0xca, 0x5f, 0x72, 0x40, 0xd2, 0xe6, 0xe2, 0x69, 0xb2, 0x07, 0x55, 0x57, 0x8e, - 0xc3, 0x24, 0xf9, 0x10, 0x2f, 0xc3, 0x3a, 0x6b, 0x27, 0x1c, 0x84, 0x77, 0x2a, 0xc2, 0xb5, 0x27, - 0xd0, 0x48, 0x4f, 0x66, 0x1c, 0xe4, 0xe3, 0x74, 0x80, 0x26, 0xeb, 0x42, 0x92, 0x87, 0xfb, 0xfb, - 0x1c, 0xdc, 0xed, 0xea, 0x3a, 0xdf, 0xf6, 0x44, 0x73, 0xfd, 0x65, 0xe4, 0xe2, 0x58, 0x0e, 0x12, - 0xd8, 0x0c, 0x82, 0x28, 0x3b, 0xf2, 0x6f, 0x94, 0xe8, 0x45, 0x29, 0x11, 0x3f, 0x49, 0x03, 0xf2, - 0x06, 0x93, 0x91, 0x33, 0x6f, 0x30, 0x44, 0x31, 0xc7, 0x15, 0x07, 0x56, 0x54, 0xf9, 0x37, 0x3a, - 0x84, 0xe1, 0xcd, 0x1d, 0xdb, 0x34, 0x6c, 0xca, 0xcf, 0xa8, 0xa2, 0x56, 0x0c, 0xef, 0x8c, 0x8f, - 0xb9, 0x12, 0xe7, 0xec, 0xff, 0xac, 0x04, 0x85, 0xbb, 0x7d, 0x6a, 0xfe, 0xaf, 0x75, 0x50, 0xfe, - 0x88, 0xee, 0xb1, 0x26, 0xe4, 0xbf, 0xb8, 0xc9, 0x38, 0x68, 0x16, 0x93, 0x41, 0x33, 0xbd, 0xf9, - 0xd2, 0xca, 0xe6, 0x7f, 0x06, 0x77, 0x32, 0x76, 0x4e, 0x1e, 0x43, 0xc1, 0xb9, 0xf8, 0x8d, 0x74, - 0xd7, 0x7d, 0xee, 0x49, 0x6b, 0x5c, 0x2a, 0xb2, 0x28, 0x0f, 0xa0, 0x89, 0xbe, 0x8b, 0x61, 0xf9, - 0x78, 0x39, 0x1d, 0xf6, 0xd1, 0x68, 0x52, 0xff, 0x5c, 0xa4, 0xbf, 0xf2, 0x25, 0x6c, 0x9f, 0x50, - 0x64, 0xea, 0x53, 0x5f, 0x33, 0xcc, 0x4c, 0xa6, 0x54, 0xed, 0x94, 0x4f, 0xd5, 0x4e, 0xca, 0x05, - 0x54, 0x26, 0x8e, 0x3e, 0xb8, 0xa2, 0xc2, 0x62, 0xbc, 0xf8, 0x92, 0x16, 0xc3, 0x6f, 0xdc, 0xbb, - 0x4b, 0x35, 0xcf, 0xb1, 0x25, 0x50, 0x8e, 0x50, 0x88, 0x76, 0x19, 0xd6, 0x69, 0xf8, 0x49, 0x5a, - 0x50, 0xb6, 0x44, 0x59, 0x2e, 0xcd, 0x14, 0x0e, 0x95, 0xef, 0xf3, 0x3c, 0xbb, 0xc8, 0xba, 0xeb, - 0x51, 0x42, 0x4a, 0x43, 0x5c, 0xa6, 0x68, 0xb2, 0x83, 0xa5, 0xde, 0x0d, 0x92, 0x13, 0x72, 0x0a, - 0x29, 0x39, 0x88, 0xd0, 0x74, 0x4c, 0x45, 0xb2, 0xa6, 0x90, 0x23, 0xdc, 0x3e, 0xae, 0x38, 0xf7, - 0x7c, 0x37, 0x54, 0x0d, 0xc7, 0x53, 0xdf, 0x55, 0xfe, 0x94, 0x83, 0x4d, 0x5e, 0x5e, 0xd6, 0xa0, - 0x3c, 0x19, 0x8c, 0xfb, 0xc3, 0xf1, 0x49, 0x73, 0x03, 0x07, 0xea, 0xf9, 0x78, 0x8c, 0x83, 0x1c, - 0xa9, 0x43, 0x75, 0x7a, 0xde, 0xeb, 0x0d, 0x06, 0xfd, 0x41, 0xbf, 0x99, 0x27, 0x00, 0xa5, 0xaf, - 0xba, 0xc3, 0xd1, 0xa0, 0xdf, 0x2c, 0x20, 0xdf, 0xf9, 0xf8, 0x17, 0xe3, 0xb3, 0x5f, 0x8d, 0x9b, - 0x9b, 0xa4, 0x01, 0x30, 0x1b, 0x9c, 0x0e, 0xc7, 0xdd, 0x19, 0xe2, 0x8a, 0x64, 0x0b, 0x2a, 0xdd, - 0xe3, 0xf1, 0x99, 0x7a, 0xda, 0x1d, 0x35, 0x4b, 0x38, 0x3b, 0x1c, 0x0f, 0x67, 0x43, 0x31, 0x5b, - 0xc6, 0xf1, 0xb4, 0xf7, 0x7a, 0xd0, 0x3f, 0x1f, 0xe1, 0xb8, 0x82, 0xdc, 0xe3, 0xb3, 0x99, 0x3a, - 0xe8, 0xf6, 0xbf, 0x6e, 0x56, 0x51, 0xe6, 0xf9, 0xf8, 0xf5, 0xa0, 0x3b, 0x9a, 0xbd, 0xfe, 0xba, - 0x09, 0xca, 0x3f, 0x73, 0xb0, 0x35, 0x71, 0xf4, 0xb8, 0xf8, 0xdb, 0x85, 0xa2, 0x61, 0xa1, 0x05, - 0x64, 0x4f, 0xc9, 0x07, 0x48, 0xe5, 0x75, 0x58, 0x98, 0x70, 0xf8, 0x20, 0x61, 0xc7, 0xc2, 0xaa, - 0x1d, 0x79, 0xcd, 0x45, 0xf5, 0xb0, 0x9e, 0x96, 0x43, 0x4c, 0x13, 0x3c, 0x3f, 0xcc, 0x45, 0x62, - 0x90, 0x36, 0xab, 0x71, 0xda, 0x29, 0x27, 0xa1, 0xeb, 0x0b, 0x96, 0x05, 0x0b, 0x64, 0x69, 0x5d, - 0xe1, 0x84, 0x1e, 0x0b, 0x30, 0x1b, 0xc9, 0x34, 0x14, 0xae, 0x50, 0x16, 0xa5, 0xa9, 0xa4, 0xca, - 0x35, 0xee, 0x63, 0x39, 0x23, 0xd8, 0x70, 0x95, 0x8a, 0xa8, 0x13, 0x25, 0xa9, 0xc7, 0x02, 0xe5, - 0x1f, 0xc2, 0x6f, 0x84, 0x67, 0xa3, 0x77, 0x26, 0xca, 0x5c, 0xfe, 0xcd, 0x69, 0x8e, 0x1e, 0x6e, - 0x98, 0x7f, 0xaf, 0x54, 0x97, 0x85, 0xd5, 0xea, 0xf2, 0x61, 0x74, 0x99, 0x37, 0xe3, 0x72, 0x3b, - 0x72, 0xc0, 0xe8, 0x6e, 0x8b, 0xb8, 0x50, 0x8c, 0xe2, 0xc2, 0x01, 0x94, 0x71, 0x75, 0x6c, 0x32, - 0xc4, 0x76, 0x4b, 0x38, 0x1c, 0x32, 0x34, 0xe3, 0x15, 0x75, 0x3d, 0xc3, 0xb1, 0xe5, 0x2e, 0xc3, - 0x21, 0x79, 0x09, 0xdb, 0x86, 0x8d, 0x26, 0x8a, 0xbb, 0x0c, 0x51, 0x2a, 0x36, 0xa5, 0xc8, 0xb8, - 0xc8, 0x6f, 0x20, 0x63, 0xdc, 0x29, 0x90, 0x8f, 0x53, 0xbd, 0x49, 0xf5, 0x1a, 0x54, 0xb2, 0x15, - 0x79, 0x00, 0x25, 0x8a, 0x97, 0xd8, 0x93, 0x65, 0xe1, 0x96, 0xe4, 0xe6, 0x37, 0x5b, 0x95, 0x73, - 0xca, 0x2b, 0x68, 0x4c, 0x7d, 0xc7, 0xd5, 0x2e, 0x69, 0xcf, 0xd4, 0x78, 0x4d, 0xf9, 0x04, 0x36, - 0x4d, 0x83, 0x17, 0x1c, 0x51, 0x40, 0x4a, 0x72, 0xc8, 0xa8, 0xc2, 0x79, 0x94, 0x3f, 0x17, 0x80, - 0xac, 0x4f, 0x66, 0x1e, 0xcc, 0x21, 0xd4, 0x98, 0xeb, 0x5c, 0x19, 0x68, 0x08, 0xea, 0xca, 0xf3, - 0x49, 0x92, 0xc8, 0x57, 0x00, 0x4c, 0x73, 0x35, 0x8b, 0xfa, 0xb8, 0xc5, 0x02, 0x17, 0xff, 0x28, - 0x5b, 0x7c, 0x67, 0x12, 0x31, 0xca, 0x1e, 0x2c, 0x46, 0x0a, 0x67, 0x5b, 0x98, 0x9a, 0x61, 0xcd, - 0x99, 0x63, 0x1a, 0x8b, 0xa5, 0xf4, 0xe6, 0xba, 0xa4, 0x4e, 0x38, 0x91, 0x7c, 0x0a, 0xfb, 0x9a, - 0x69, 0x3a, 0xdf, 0xc9, 0x66, 0x6d, 0x4e, 0x7f, 0xcb, 0x34, 0x9b, 0x9f, 0x9a, 0xc8, 0x5a, 0xbb, - 0x7c, 0x56, 0xf4, 0x6d, 0x83, 0x70, 0x8e, 0x74, 0xe0, 0x8e, 0xe4, 0xbf, 0x30, 0x6c, 0x1d, 0x2b, - 0x17, 0x0b, 0xdd, 0x4d, 0x78, 0xc0, 0x8e, 0x98, 0x3a, 0x16, 0x33, 0xa7, 0xe8, 0x7b, 0x27, 0x40, - 0xf8, 0x3a, 0x54, 0x9f, 0xfb, 0x0e, 0x73, 0x4c, 0xe7, 0xd2, 0xa0, 0x61, 0x6f, 0xc1, 0x1b, 0x99, - 0x99, 0xa0, 0x2e, 0xa7, 0xd4, 0xa4, 0x0b, 0xdf, 0x71, 0x67, 0xd4, 0xb5, 0xd4, 0x1d, 0x89, 0x99, - 0x45, 0x90, 0xf6, 0x4f, 0x61, 0x7b, 0x65, 0xd3, 0xb7, 0x2a, 0x30, 0x7d, 0xd8, 0xcd, 0x92, 0x44, - 0x7e, 0x0d, 0x07, 0x96, 0xe6, 0x2f, 0xbe, 0x9d, 0x9b, 0xda, 0x05, 0x35, 0xd1, 0x08, 0x58, 0x02, - 0x1b, 0x8e, 0x1d, 0x16, 0x50, 0x0f, 0xb2, 0x94, 0x1c, 0x21, 0x33, 0xd6, 0x90, 0x86, 0x4b, 0xb1, - 0x81, 0x53, 0xf7, 0xf8, 0x22, 0x9c, 0x3c, 0x88, 0x97, 0x50, 0x46, 0x70, 0x78, 0x13, 0x34, 0x63, - 0x17, 0xfb, 0x50, 0xe2, 0x8a, 0x8b, 0x47, 0x93, 0xaa, 0x2a, 0x47, 0xca, 0xdf, 0x73, 0xd0, 0x96, - 0xad, 0x85, 0x38, 0x96, 0xf4, 0xdb, 0xd4, 0xf1, 0xca, 0xdb, 0xd4, 0x93, 0x44, 0xeb, 0x9e, 0xc1, - 0x9f, 0xf9, 0x50, 0xa5, 0xde, 0xf4, 0x50, 0xf5, 0xe3, 0xa4, 0x85, 0x1b, 0x47, 0x07, 0xd7, 0xc8, - 0x48, 0x9a, 0xfe, 0x6f, 0x39, 0xa8, 0x46, 0x0f, 0x80, 0xe4, 0x59, 0x42, 0x4b, 0x5c, 0x61, 0x17, - 0x57, 0x88, 0xa6, 0x3b, 0x2b, 0x41, 0xa7, 0x09, 0x05, 0x8c, 0x84, 0xa2, 0xba, 0xc7, 0x4f, 0x34, - 0x8e, 0x0c, 0xa1, 0xa2, 0xa0, 0x97, 0x23, 0x65, 0x0c, 0x25, 0x29, 0xa1, 0x0c, 0x85, 0xf1, 0x70, - 0xb4, 0x9a, 0xb4, 0x00, 0x4a, 0xbd, 0xd1, 0xd9, 0x94, 0x67, 0xac, 0x64, 0x22, 0x2a, 0x90, 0x5d, - 0x68, 0x4e, 0xba, 0xea, 0x6c, 0xd8, 0x1d, 0xcd, 0x23, 0xea, 0xe6, 0x93, 0x8f, 0xe0, 0x4e, 0xc6, - 0xbe, 0x48, 0x15, 0x8a, 0x22, 0x25, 0x6d, 0x60, 0x4a, 0x1a, 0x9f, 0xcd, 0xe6, 0x62, 0x98, 0x3b, - 0xfa, 0x43, 0x19, 0x1a, 0x5d, 0xc6, 0x54, 0xf1, 0x1e, 0x3a, 0x5d, 0xda, 0x0b, 0x72, 0x0c, 0xfb, - 0x27, 0xd4, 0x8f, 0x36, 0xd7, 0xa7, 0xcc, 0xa5, 0x0b, 0x0d, 0x13, 0xca, 0x9d, 0x84, 0xdd, 0xc2, - 0xd7, 0xcb, 0xf6, 0xce, 0xda, 0x63, 0xa2, 0xb2, 0x41, 0x3e, 0x81, 0xad, 0xe4, 0x1a, 0xa4, 0x99, - 0xb2, 0x97, 0x4a, 0xdf, 0xb6, 0xeb, 0x29, 0x8a, 0xb2, 0x41, 0x5e, 0x02, 0x08, 0x08, 0x7f, 0x83, - 0x23, 0x09, 0x51, 0xa1, 0xa4, 0xec, 0xb7, 0x2c, 0x65, 0x83, 0xf4, 0x79, 0xf1, 0xc4, 0x1f, 0xd5, - 0x42, 0x7c, 0xa6, 0xaa, 0xed, 0xeb, 0xdf, 0xde, 0x94, 0x0d, 0xf2, 0x1c, 0xea, 0x27, 0xd4, 0x4f, - 0xbc, 0xa0, 0x64, 0xe9, 0xd0, 0x48, 0xb7, 0xe9, 0xca, 0x06, 0x79, 0x05, 0x3b, 0x27, 0xd4, 0x5f, - 0x69, 0x03, 0x77, 0x92, 0xbd, 0x85, 0x40, 0x66, 0xb4, 0x1b, 0x7c, 0xd7, 0x64, 0x0d, 0xed, 0x91, - 0x2a, 0xf2, 0xf2, 0x77, 0xe8, 0xf6, 0x7e, 0x76, 0x2b, 0xa4, 0x6c, 0x90, 0xd7, 0x70, 0x80, 0x5f, - 0x59, 0xd5, 0x69, 0x96, 0xe6, 0x07, 0xd9, 0x45, 0x2a, 0x9a, 0xbe, 0x07, 0x7b, 0x99, 0x9d, 0x0e, - 0xe1, 0x6f, 0x1a, 0xd7, 0x36, 0x41, 0xed, 0x58, 0x4d, 0xb1, 0x48, 0x66, 0xa7, 0x22, 0x16, 0xb9, - 0xb6, 0x89, 0x59, 0x5b, 0x24, 0xb3, 0xd5, 0x20, 0xf2, 0x75, 0xc5, 0xfc, 0x77, 0x16, 0xf9, 0x94, - 0x3b, 0x5f, 0x5c, 0x71, 0x70, 0x5f, 0x58, 0xa9, 0xae, 0xdb, 0x61, 0xbd, 0x20, 0x28, 0x1c, 0x85, - 0xe7, 0xb8, 0x92, 0x56, 0x13, 0x07, 0x41, 0x56, 0x93, 0x1a, 0x45, 0xd3, 0xfd, 0x9c, 0x9f, 0x5f, - 0x97, 0xb1, 0xd4, 0x7d, 0xcb, 0xb2, 0xff, 0x07, 0xef, 0x0e, 0x6c, 0xca, 0xc6, 0x45, 0x89, 0xff, - 0x86, 0xf8, 0xc9, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x91, 0x3f, 0x26, 0x66, 0xa2, 0x18, 0x00, - 0x00, + 0x92, 0x74, 0x6a, 0x48, 0x81, 0xc4, 0x36, 0xfd, 0x8e, 0x13, 0xe7, 0xaf, 0x25, 0x96, 0x14, 0xca, + 0xf7, 0x39, 0xd8, 0x3f, 0x0d, 0x4c, 0xdf, 0x58, 0x17, 0x7a, 0x1a, 0xf9, 0x35, 0x21, 0xf8, 0x29, + 0xee, 0x95, 0xcd, 0x10, 0x8a, 0x40, 0x6a, 0x61, 0x8c, 0x24, 0x7f, 0xfb, 0x1c, 0x9a, 0xab, 0x04, + 0x19, 0x86, 0x79, 0x9a, 0x34, 0x4c, 0xed, 0x68, 0x6f, 0x4d, 0x75, 0x94, 0x94, 0xb4, 0xd7, 0x0f, + 0x79, 0xa8, 0xa7, 0x08, 0x6e, 0x88, 0x60, 0x0c, 0x3e, 0x9d, 0x32, 0xd3, 0x59, 0xe2, 0xaa, 0xf0, + 0x7c, 0x45, 0x20, 0x86, 0x3a, 0xc6, 0xb2, 0x5c, 0xf4, 0x97, 0x8c, 0xb6, 0x0a, 0x22, 0x96, 0x05, + 0x6a, 0xb6, 0x64, 0x94, 0xdc, 0x85, 0x0a, 0x73, 0xf4, 0xb9, 0xad, 0x59, 0xb4, 0xb5, 0xc9, 0x57, + 0xcb, 0xcc, 0xd1, 0xc7, 0x9a, 0x45, 0xf1, 0x8a, 0xe1, 0x92, 0xc1, 0x5a, 0x45, 0x11, 0x4f, 0xcc, + 0xd1, 0x87, 0x0c, 0xd5, 0x41, 0xb4, 0x8c, 0xe0, 0x92, 0x50, 0x87, 0x39, 0xba, 0x88, 0x4d, 0xd2, + 0x05, 0x58, 0x38, 0xb6, 0xaf, 0x19, 0x36, 0x75, 0xbd, 0x56, 0x99, 0x1b, 0xf9, 0xc3, 0xb5, 0x53, + 0x77, 0x7a, 0x11, 0x8d, 0x30, 0x6d, 0x82, 0x09, 0x95, 0x46, 0x09, 0x57, 0x8e, 0x19, 0x58, 0xd4, + 0x6b, 0x55, 0x0e, 0x0b, 0xa8, 0x34, 0x73, 0xf4, 0x5f, 0x0a, 0x4c, 0x7b, 0x04, 0xdb, 0x2b, 0xfc, + 0x19, 0x96, 0xff, 0x51, 0xda, 0xf2, 0x75, 0xd4, 0x21, 0xe2, 0x4a, 0x5a, 0xfc, 0x1c, 0xaa, 0x11, + 0x9e, 0x3c, 0x84, 0x46, 0xa4, 0x89, 0xb0, 0x8a, 0xd8, 0xb2, 0x1e, 0x61, 0xb9, 0x6d, 0x3e, 0x84, + 0x2d, 0x8b, 0x5a, 0x8e, 0xbb, 0x9c, 0x9b, 0x86, 0x65, 0xf8, 0x5c, 0x46, 0x41, 0xad, 0x09, 0xdc, + 0x08, 0x51, 0xca, 0x0f, 0x25, 0x80, 0xbe, 0xf0, 0x83, 0xfd, 0x8d, 0x43, 0xde, 0x87, 0x2a, 0x6e, + 0xe7, 0x31, 0x6d, 0x11, 0xee, 0x19, 0x23, 0x88, 0x02, 0x5b, 0x68, 0x50, 0xfa, 0x4d, 0x60, 0x52, + 0x8f, 0xfa, 0xd2, 0x8f, 0x29, 0x1c, 0xf9, 0x00, 0xa4, 0xe3, 0x2c, 0x6a, 0xfb, 0x69, 0x57, 0x22, + 0x86, 0xc7, 0x89, 0xaf, 0xb9, 0xfe, 0x1c, 0x53, 0xa9, 0x74, 0x66, 0x95, 0x63, 0x66, 0x86, 0x45, + 0xc9, 0x33, 0xd8, 0x64, 0x18, 0xf7, 0x45, 0xee, 0x92, 0x16, 0xbf, 0xf3, 0x91, 0x7a, 0x9d, 0x38, + 0xc8, 0x39, 0x15, 0x79, 0x01, 0x15, 0x19, 0x62, 0xe8, 0x63, 0xe4, 0x78, 0x7f, 0x85, 0x23, 0x4c, + 0x9b, 0x82, 0x2b, 0xa2, 0x26, 0x5f, 0x40, 0x95, 0xda, 0x3a, 0x73, 0x0c, 0xdb, 0x0f, 0xfd, 0x7f, + 0x6f, 0x85, 0x75, 0x10, 0xae, 0x0b, 0xde, 0x98, 0x9e, 0x3c, 0x87, 0xb2, 0x47, 0x17, 0x2e, 0xf5, + 0x85, 0xdb, 0x6b, 0x47, 0xef, 0xad, 0x49, 0xe5, 0xab, 0x82, 0x31, 0xa4, 0x45, 0x99, 0x86, 0x7d, + 0xe9, 0x52, 0xcf, 0xa3, 0x5e, 0xab, 0x9a, 0x29, 0x73, 0x18, 0xae, 0x4b, 0x99, 0x11, 0x3d, 0xe9, + 0x42, 0xcd, 0xa5, 0xcc, 0x34, 0x16, 0x9a, 0x8f, 0xa6, 0x07, 0xce, 0x7e, 0x7f, 0x85, 0x5d, 0x8d, + 0x29, 0x64, 0x2e, 0x48, 0xf0, 0x90, 0xfd, 0x28, 0xa3, 0xd7, 0xb8, 0xd9, 0xc3, 0x94, 0xfd, 0x19, + 0x54, 0xdf, 0x95, 0x1c, 0xae, 0x4d, 0xd8, 0xed, 0x2f, 0xa2, 0x24, 0xf0, 0x1f, 0x30, 0xbf, 0x82, + 0x46, 0xda, 0xc2, 0xb7, 0xe2, 0xfe, 0x1c, 0xb6, 0x92, 0x46, 0xbe, 0xad, 0xe4, 0xb4, 0x9d, 0x6f, + 0xc5, 0xfd, 0x25, 0x34, 0x57, 0xcd, 0x7c, 0xab, 0x2a, 0xf7, 0xd7, 0x3c, 0x34, 0xc2, 0xc2, 0xec, + 0x39, 0x81, 0xbb, 0xa0, 0x98, 0x4a, 0x16, 0x2c, 0x98, 0xbb, 0xa2, 0x50, 0xf3, 0x6d, 0x0a, 0x2a, + 0x2c, 0x58, 0x90, 0x28, 0xdd, 0x48, 0x90, 0xbc, 0xc5, 0x95, 0x05, 0x0b, 0xf8, 0x15, 0xc6, 0x64, + 0x20, 0x6f, 0x79, 0xb8, 0x41, 0x81, 0x53, 0xd4, 0x05, 0x36, 0xdc, 0x63, 0x35, 0x19, 0x6c, 0xae, + 0x25, 0x03, 0xf2, 0x08, 0xb6, 0xdd, 0xc0, 0xb6, 0x0d, 0xfb, 0x72, 0x8e, 0x6d, 0x8b, 0x1d, 0x58, + 0x3c, 0xa9, 0x16, 0xd4, 0xba, 0x44, 0x77, 0x19, 0x1b, 0x07, 0x16, 0xf9, 0x04, 0xf6, 0x92, 0x74, + 0xfe, 0xb7, 0x86, 0xab, 0x73, 0x6a, 0xe0, 0xd4, 0x24, 0xa6, 0x9e, 0xe1, 0x12, 0xb2, 0x7c, 0x06, + 0xad, 0x24, 0x8b, 0x61, 0xfb, 0xd4, 0xb5, 0x35, 0x93, 0x73, 0xd5, 0x38, 0xd7, 0x5e, 0xcc, 0x35, + 0x94, 0xab, 0xe3, 0xc0, 0x52, 0xfe, 0x92, 0x03, 0x92, 0x36, 0x17, 0x2f, 0x93, 0x3d, 0xa8, 0xba, + 0x12, 0x0e, 0x8b, 0xe4, 0x43, 0xbc, 0x0c, 0xeb, 0xa4, 0x9d, 0x10, 0x08, 0xef, 0x54, 0xc4, 0xd7, + 0x9e, 0x40, 0x23, 0xbd, 0x98, 0xe1, 0xc8, 0xc7, 0xe9, 0x04, 0x4d, 0xd6, 0x85, 0x24, 0x9d, 0xfb, + 0xfb, 0x1c, 0xdc, 0xed, 0xea, 0x3a, 0x3f, 0xf6, 0x44, 0x73, 0xfd, 0x65, 0x14, 0xe2, 0xd8, 0x0e, + 0x12, 0xd8, 0x0c, 0x82, 0xa8, 0x3a, 0xf2, 0x6f, 0x94, 0xe8, 0x45, 0x25, 0x11, 0x3f, 0x49, 0x03, + 0xf2, 0x06, 0x93, 0x99, 0x33, 0x6f, 0x30, 0xe4, 0x62, 0x8e, 0x2b, 0x1c, 0x56, 0x54, 0xf9, 0x37, + 0x06, 0x84, 0xe1, 0xcd, 0x1d, 0xdb, 0x34, 0x6c, 0xca, 0x7d, 0x54, 0x51, 0x2b, 0x86, 0x77, 0xc6, + 0x61, 0xae, 0xc4, 0x39, 0xfb, 0x3f, 0x2b, 0x41, 0xe1, 0x6e, 0x9f, 0x9a, 0xff, 0x6b, 0x1d, 0x94, + 0x3f, 0x62, 0x78, 0xac, 0x09, 0xf9, 0x2f, 0x1e, 0x32, 0x4e, 0x9a, 0xc5, 0x64, 0xd2, 0x4c, 0x1f, + 0xbe, 0xb4, 0x72, 0xf8, 0x9f, 0xc1, 0x9d, 0x8c, 0x93, 0x93, 0xc7, 0x50, 0x70, 0x2e, 0x7e, 0x23, + 0xc3, 0x75, 0x9f, 0x47, 0xd2, 0x1a, 0x95, 0x8a, 0x24, 0xca, 0x03, 0x68, 0x62, 0xec, 0x62, 0x5a, + 0x3e, 0x5e, 0x4e, 0x87, 0x7d, 0x34, 0x9a, 0xd4, 0x3f, 0x17, 0xe9, 0xaf, 0x7c, 0x09, 0xdb, 0x27, + 0x14, 0x89, 0xfa, 0xd4, 0xd7, 0x0c, 0x33, 0x93, 0x28, 0xd5, 0x3b, 0xe5, 0x53, 0xbd, 0x93, 0x72, + 0x01, 0x95, 0x89, 0xa3, 0x0f, 0xae, 0xa8, 0xb0, 0x18, 0x6f, 0xbe, 0xa4, 0xc5, 0xf0, 0x1b, 0xcf, + 0xee, 0x52, 0xcd, 0x73, 0x6c, 0xc9, 0x28, 0x21, 0x14, 0xa2, 0x5d, 0x86, 0x7d, 0x1a, 0x7e, 0x92, + 0x16, 0x94, 0x2d, 0xd1, 0x96, 0x4b, 0x33, 0x85, 0xa0, 0xf2, 0x7d, 0x9e, 0x57, 0x17, 0xd9, 0x77, + 0x3d, 0x4a, 0x48, 0x69, 0x88, 0xcb, 0x14, 0x2d, 0x76, 0xb0, 0xd5, 0xbb, 0x41, 0x72, 0x42, 0x4e, + 0x21, 0x25, 0x07, 0x39, 0x34, 0x1d, 0x4b, 0x91, 0xec, 0x29, 0x24, 0x84, 0xc7, 0xc7, 0x1d, 0xe7, + 0x9e, 0xef, 0x86, 0xaa, 0x21, 0x3c, 0xf5, 0x5d, 0xe5, 0x4f, 0x39, 0xd8, 0xe4, 0xed, 0x65, 0x0d, + 0xca, 0x93, 0xc1, 0xb8, 0x3f, 0x1c, 0x9f, 0x34, 0x37, 0x10, 0x50, 0xcf, 0xc7, 0x63, 0x04, 0x72, + 0xa4, 0x0e, 0xd5, 0xe9, 0x79, 0xaf, 0x37, 0x18, 0xf4, 0x07, 0xfd, 0x66, 0x9e, 0x00, 0x94, 0xbe, + 0xea, 0x0e, 0x47, 0x83, 0x7e, 0xb3, 0x80, 0x74, 0xe7, 0xe3, 0x5f, 0x8c, 0xcf, 0x7e, 0x35, 0x6e, + 0x6e, 0x92, 0x06, 0xc0, 0x6c, 0x70, 0x3a, 0x1c, 0x77, 0x67, 0xc8, 0x57, 0x24, 0x5b, 0x50, 0xe9, + 0x1e, 0x8f, 0xcf, 0xd4, 0xd3, 0xee, 0xa8, 0x59, 0xc2, 0xd5, 0xe1, 0x78, 0x38, 0x1b, 0x8a, 0xd5, + 0x32, 0xc2, 0xd3, 0xde, 0xeb, 0x41, 0xff, 0x7c, 0x84, 0x70, 0x05, 0xa9, 0xc7, 0x67, 0x33, 0x75, + 0xd0, 0xed, 0x7f, 0xdd, 0xac, 0xa2, 0xcc, 0xf3, 0xf1, 0xeb, 0x41, 0x77, 0x34, 0x7b, 0xfd, 0x75, + 0x13, 0x94, 0x7f, 0xe6, 0x60, 0x6b, 0xe2, 0xe8, 0x71, 0xf3, 0xb7, 0x0b, 0x45, 0xc3, 0x42, 0x0b, + 0xc8, 0x99, 0x92, 0x03, 0x88, 0xe5, 0x7d, 0x58, 0x58, 0x70, 0x38, 0x90, 0xb0, 0x63, 0x61, 0xd5, + 0x8e, 0xbc, 0xe7, 0xa2, 0x7a, 0xd8, 0x4f, 0x4b, 0x10, 0xcb, 0x04, 0xaf, 0x0f, 0x73, 0x51, 0x18, + 0xa4, 0xcd, 0x6a, 0x1c, 0x77, 0xca, 0x51, 0x18, 0xfa, 0x82, 0x64, 0xc1, 0x02, 0xd9, 0x5a, 0x57, + 0x38, 0xa2, 0xc7, 0x02, 0xac, 0x46, 0xb2, 0x0c, 0x85, 0x3b, 0x94, 0x45, 0x6b, 0x2a, 0xb1, 0x72, + 0x8f, 0xfb, 0xd8, 0xce, 0x08, 0x32, 0xdc, 0xa5, 0x22, 0xfa, 0x44, 0x89, 0xea, 0xb1, 0x40, 0xf9, + 0x87, 0x88, 0x1b, 0x11, 0xd9, 0x18, 0x9d, 0x89, 0x36, 0x97, 0x7f, 0x73, 0x9c, 0xa3, 0x87, 0x07, + 0xe6, 0xdf, 0x2b, 0xdd, 0x65, 0x61, 0xb5, 0xbb, 0x7c, 0x18, 0x5d, 0xe6, 0xcd, 0xb8, 0xdd, 0x8e, + 0x02, 0x30, 0xba, 0xdb, 0x22, 0x2f, 0x14, 0xa3, 0xbc, 0x70, 0x00, 0x65, 0xdc, 0x1d, 0x87, 0x0c, + 0x71, 0xdc, 0x12, 0x82, 0x43, 0x86, 0x66, 0xbc, 0xa2, 0xae, 0x67, 0x38, 0xb6, 0x3c, 0x65, 0x08, + 0x92, 0x97, 0xb0, 0x6d, 0xd8, 0x68, 0xa2, 0x78, 0xca, 0x10, 0xad, 0x62, 0x53, 0x8a, 0x8c, 0x9b, + 0xfc, 0x06, 0x12, 0xc6, 0x93, 0x02, 0xf9, 0x38, 0x35, 0x9b, 0x54, 0xaf, 0xe1, 0x4a, 0x8e, 0x22, + 0x0f, 0xa0, 0x44, 0xf1, 0x12, 0x7b, 0xb2, 0x2d, 0xdc, 0x92, 0xd4, 0xfc, 0x66, 0xab, 0x72, 0x4d, + 0x79, 0x05, 0x8d, 0xa9, 0xef, 0xb8, 0xda, 0x25, 0xed, 0x99, 0x1a, 0xef, 0x29, 0x9f, 0xc0, 0xa6, + 0x69, 0xf0, 0x86, 0x23, 0x4a, 0x48, 0x49, 0x0a, 0x99, 0x55, 0x38, 0x8d, 0xf2, 0xe7, 0x02, 0x90, + 0xf5, 0xc5, 0x4c, 0xc7, 0x1c, 0x42, 0x8d, 0xb9, 0xce, 0x95, 0x81, 0x86, 0xa0, 0xae, 0xf4, 0x4f, + 0x12, 0x45, 0xbe, 0x02, 0x60, 0x9a, 0xab, 0x59, 0xd4, 0xc7, 0x23, 0x16, 0xb8, 0xf8, 0x47, 0xd9, + 0xe2, 0x3b, 0x93, 0x88, 0x50, 0xce, 0x60, 0x31, 0xa7, 0x08, 0xb6, 0x85, 0xa9, 0x19, 0xd6, 0x9c, + 0x39, 0xa6, 0xb1, 0x58, 0xca, 0x68, 0xae, 0x4b, 0xec, 0x84, 0x23, 0xc9, 0xa7, 0xb0, 0xaf, 0x99, + 0xa6, 0xf3, 0x9d, 0x1c, 0xd6, 0xe6, 0xf4, 0xb7, 0x4c, 0xb3, 0xb9, 0xd7, 0x44, 0xd5, 0xda, 0xe5, + 0xab, 0x62, 0x6e, 0x1b, 0x84, 0x6b, 0xa4, 0x03, 0x77, 0x24, 0xfd, 0x85, 0x61, 0xeb, 0xd8, 0xb9, + 0x58, 0x18, 0x6e, 0x22, 0x02, 0x76, 0xc4, 0xd2, 0xb1, 0x58, 0x39, 0xc5, 0xd8, 0x3b, 0x01, 0xc2, + 0xf7, 0xa1, 0xfa, 0xdc, 0x77, 0x98, 0x63, 0x3a, 0x97, 0x06, 0x0d, 0x67, 0x0b, 0x3e, 0xc8, 0xcc, + 0x04, 0x76, 0x39, 0xa5, 0x26, 0x5d, 0xf8, 0x8e, 0x3b, 0xa3, 0xae, 0xa5, 0xee, 0x48, 0x9e, 0x59, + 0xc4, 0xd2, 0xfe, 0x29, 0x6c, 0xaf, 0x1c, 0xfa, 0x56, 0x0d, 0xa6, 0x0f, 0xbb, 0x59, 0x92, 0xc8, + 0xaf, 0xe1, 0xc0, 0xd2, 0xfc, 0xc5, 0xb7, 0x73, 0x53, 0xbb, 0xa0, 0x26, 0x1a, 0x01, 0x5b, 0x60, + 0xc3, 0xb1, 0xc3, 0x06, 0xea, 0x41, 0x96, 0x92, 0x23, 0x24, 0xc6, 0x1e, 0xd2, 0x70, 0x29, 0x0e, + 0x70, 0xea, 0x1e, 0xdf, 0x84, 0xa3, 0x07, 0xf1, 0x16, 0xca, 0x08, 0x0e, 0x6f, 0x62, 0xcd, 0x38, + 0xc5, 0x3e, 0x94, 0xb8, 0xe2, 0xe2, 0xd1, 0xa4, 0xaa, 0x4a, 0x48, 0xf9, 0x5b, 0x0e, 0xda, 0x72, + 0xb4, 0x10, 0x6e, 0x49, 0xbf, 0x4d, 0x1d, 0xaf, 0xbc, 0x4d, 0x3d, 0x49, 0x8c, 0xee, 0x19, 0xf4, + 0x99, 0x0f, 0x55, 0xea, 0x4d, 0x0f, 0x55, 0x3f, 0x4e, 0x5a, 0xb8, 0x71, 0x74, 0x70, 0x8d, 0x8c, + 0xa4, 0xe9, 0xff, 0x9e, 0x83, 0x6a, 0xf4, 0x00, 0x48, 0x9e, 0x25, 0xb4, 0xc4, 0x1d, 0x76, 0x71, + 0x87, 0x68, 0xb9, 0xb3, 0x92, 0x74, 0x9a, 0x50, 0xc0, 0x4c, 0x28, 0xba, 0x7b, 0xfc, 0x44, 0xe3, + 0xc8, 0x14, 0x2a, 0x1a, 0x7a, 0x09, 0x29, 0x33, 0x28, 0x49, 0x09, 0x65, 0x28, 0x8c, 0x87, 0xa3, + 0xd5, 0xa2, 0x05, 0x50, 0xea, 0x8d, 0xce, 0xa6, 0xbc, 0x62, 0x25, 0x0b, 0x51, 0x01, 0xa1, 0xe9, + 0xac, 0xab, 0xf2, 0x32, 0xb4, 0x29, 0xa0, 0xb3, 0xc9, 0x84, 0x97, 0xac, 0x27, 0x1f, 0xc1, 0x9d, + 0x8c, 0xd3, 0x91, 0x2a, 0x14, 0x45, 0x61, 0xda, 0xc0, 0xc2, 0x34, 0x3e, 0x9b, 0xcd, 0x05, 0x98, + 0x3b, 0xfa, 0x43, 0x19, 0x1a, 0x5d, 0xc6, 0x54, 0xf1, 0x2a, 0x3a, 0x5d, 0xda, 0x0b, 0x72, 0x0c, + 0xfb, 0x27, 0xd4, 0x8f, 0x8e, 0xd8, 0xa7, 0xcc, 0xa5, 0x0b, 0x0d, 0xcb, 0xca, 0x9d, 0x84, 0xf5, + 0xc2, 0x37, 0xcc, 0xf6, 0xce, 0xda, 0x93, 0xa2, 0xb2, 0x41, 0x3e, 0x81, 0xad, 0xe4, 0x1e, 0xa4, + 0x99, 0xb2, 0x9a, 0x4a, 0xdf, 0xb6, 0xeb, 0x29, 0x8c, 0xb2, 0x41, 0x5e, 0x02, 0x08, 0x16, 0xfe, + 0x12, 0x47, 0x12, 0xa2, 0x42, 0x49, 0xd9, 0x2f, 0x5a, 0xca, 0x06, 0xe9, 0xf3, 0x16, 0x8a, 0x3f, + 0xad, 0x85, 0xfc, 0x99, 0xaa, 0xb6, 0xaf, 0x7f, 0x81, 0x53, 0x36, 0xc8, 0x73, 0xa8, 0x9f, 0x50, + 0x3f, 0xf1, 0x8e, 0x92, 0xa5, 0x43, 0x23, 0x3d, 0xac, 0x2b, 0x1b, 0xe4, 0x15, 0xec, 0x9c, 0x50, + 0x7f, 0x65, 0x18, 0xdc, 0x49, 0x4e, 0x18, 0x82, 0x33, 0x63, 0xe8, 0xe0, 0xa7, 0x26, 0x6b, 0xdc, + 0x1e, 0xa9, 0x22, 0x2d, 0x7f, 0x8d, 0x6e, 0xef, 0x67, 0x0f, 0x44, 0xca, 0x06, 0x79, 0x0d, 0x07, + 0xf8, 0x95, 0xd5, 0xa3, 0x66, 0x69, 0x7e, 0x90, 0xdd, 0xaa, 0xa2, 0xe9, 0x7b, 0xb0, 0x97, 0x39, + 0xef, 0x10, 0xfe, 0xb2, 0x71, 0xed, 0x28, 0xd4, 0x8e, 0xd5, 0x14, 0x9b, 0x64, 0xce, 0x2b, 0x62, + 0x93, 0x6b, 0x47, 0x99, 0xb5, 0x4d, 0x32, 0x07, 0x0e, 0x22, 0xdf, 0x58, 0xcc, 0x7f, 0x67, 0x93, + 0x4f, 0x79, 0xf0, 0xc5, 0x7d, 0x07, 0x8f, 0x85, 0x95, 0x1e, 0xbb, 0x1d, 0x76, 0x0d, 0x02, 0xc3, + 0xb9, 0xd0, 0x8f, 0x2b, 0xc5, 0x35, 0xe1, 0x08, 0xb2, 0x5a, 0xda, 0x28, 0x9a, 0xee, 0xe7, 0xdc, + 0x7f, 0x5d, 0xc6, 0x52, 0xf7, 0x2d, 0xcb, 0xfe, 0x1f, 0xbc, 0x3b, 0xbd, 0x29, 0x1b, 0x17, 0x25, + 0xfe, 0x33, 0xe2, 0x27, 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x51, 0x35, 0x98, 0x63, 0xa8, 0x18, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/worker/server/pb/app_runtime_server.proto b/worker/server/pb/app_runtime_server.proto index 04118093c..43ca99183 100644 --- a/worker/server/pb/app_runtime_server.proto +++ b/worker/server/pb/app_runtime_server.proto @@ -243,7 +243,8 @@ message AppStatus { RUNNING = 1; CLOSED = 2; ABNORMAL = 3; - PARTIAL_ABNORMAL = 4; + STARTING = 4; + STOPPING = 5; } Status status = 1; From 22def36356cc79cb8ee237362c4397d68c77760c Mon Sep 17 00:00:00 2001 From: GLYASAI Date: Tue, 24 Nov 2020 21:17:39 +0800 Subject: [PATCH 2/3] some abnormal --- worker/appm/store/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/appm/store/store.go b/worker/appm/store/store.go index 89a84592d..fc59369d1 100644 --- a/worker/appm/store/store.go +++ b/worker/appm/store/store.go @@ -1068,7 +1068,7 @@ func appClosed(statuses map[string]string) bool { func appAbnormal(statuses map[string]string) bool { for _, status := range statuses { - if status == v1.ABNORMAL { + if status == v1.ABNORMAL || status == v1.SOMEABNORMAL { return true } } From 168bffd7714206c296ec91b023a7bae026aea72a Mon Sep 17 00:00:00 2001 From: GLYASAI Date: Wed, 25 Nov 2020 14:21:35 +0800 Subject: [PATCH 3/3] make running the default --- worker/appm/store/store.go | 24 ++++++++++++------------ worker/appm/types/v1/status.go | 3 --- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/worker/appm/store/store.go b/worker/appm/store/store.go index fc59369d1..c5e6aaa40 100644 --- a/worker/appm/store/store.go +++ b/worker/appm/store/store.go @@ -1039,9 +1039,11 @@ func (a *appRuntimeStore) GetAppStatus(appID string) (pb.AppStatus_Status, error serviceIDs = append(serviceIDs, s.ServiceID) } - appStatus := pb.AppStatus_NIL + appStatus := pb.AppStatus_RUNNING serviceStatuses := a.GetAppServicesStatus(serviceIDs) switch { + case appNil(serviceStatuses): + appStatus = pb.AppStatus_NIL case appClosed(serviceStatuses): appStatus = pb.AppStatus_CLOSED case appAbnormal(serviceStatuses): @@ -1050,13 +1052,20 @@ func (a *appRuntimeStore) GetAppStatus(appID string) (pb.AppStatus_Status, error appStatus = pb.AppStatus_STARTING case appStopping(serviceStatuses): appStatus = pb.AppStatus_STOPPING - case appRunning(serviceStatuses): - appStatus = pb.AppStatus_RUNNING } return appStatus, nil } +func appNil(statuses map[string]string) bool { + for _, status := range statuses { + if status != v1.UNDEPLOY { + return false + } + } + return true +} + func appClosed(statuses map[string]string) bool { for _, status := range statuses { if status != v1.CLOSED { @@ -1099,15 +1108,6 @@ func appStopping(statuses map[string]string) bool { return stopping } -func appRunning(statuses map[string]string) bool { - for _, status := range statuses { - if status == v1.RUNNING { - return true - } - } - return false -} - func (a *appRuntimeStore) GetNeedBillingStatus(serviceIDs []string) map[string]string { statusMap := make(map[string]string, len(serviceIDs)) if serviceIDs == nil || len(serviceIDs) == 0 { diff --git a/worker/appm/types/v1/status.go b/worker/appm/types/v1/status.go index a7692aafe..2d149a25f 100644 --- a/worker/appm/types/v1/status.go +++ b/worker/appm/types/v1/status.go @@ -116,9 +116,6 @@ func (a *AppService) GetServiceStatus() string { if a.statefulset == nil && a.deployment == nil && len(a.pods) > 0 { return STOPPING } - // if a.IsWaitting() { - // return WAITTING - // } if (a.statefulset != nil || a.deployment != nil) && len(a.pods) < a.Replicas { return STARTING }