From 324c03818212d61c502a3ec69a64bf7b47684bef Mon Sep 17 00:00:00 2001 From: GLYASAI Date: Mon, 10 May 2021 19:32:27 +0800 Subject: [PATCH] temp --- worker/appm/store/lister.go | 1 + worker/appm/store/store.go | 16 +- worker/server/pb/app_runtime_server.pb.go | 325 +++++++++++----------- worker/server/pb/app_runtime_server.proto | 1 + worker/server/server.go | 42 ++- 5 files changed, 216 insertions(+), 169 deletions(-) diff --git a/worker/appm/store/lister.go b/worker/appm/store/lister.go index a37e3aeca..916557391 100644 --- a/worker/appm/store/lister.go +++ b/worker/appm/store/lister.go @@ -36,6 +36,7 @@ type Lister struct { StatefulSet appsv1.StatefulSetLister Deployment appsv1.DeploymentLister Pod corev1.PodLister + ReplicaSets appsv1.ReplicaSetLister ConfigMap corev1.ConfigMapLister Endpoints corev1.EndpointsLister Nodes corev1.NodeLister diff --git a/worker/appm/store/store.go b/worker/appm/store/store.go index 12043bbf4..e52e62327 100644 --- a/worker/appm/store/store.go +++ b/worker/appm/store/store.go @@ -21,17 +21,16 @@ package store import ( "context" "fmt" - "github.com/goodrain/rainbond/api/util/bcode" - "github.com/goodrain/rainbond/pkg/apis/rainbond/v1alpha1" - "github.com/pkg/errors" "os" "sync" "time" "github.com/eapache/channels" + "github.com/goodrain/rainbond/api/util/bcode" "github.com/goodrain/rainbond/cmd/worker/option" "github.com/goodrain/rainbond/db" "github.com/goodrain/rainbond/db/model" + "github.com/goodrain/rainbond/pkg/apis/rainbond/v1alpha1" rainbondversioned "github.com/goodrain/rainbond/pkg/generated/clientset/versioned" "github.com/goodrain/rainbond/pkg/generated/informers/externalversions" "github.com/goodrain/rainbond/util/constants" @@ -42,6 +41,7 @@ import ( "github.com/goodrain/rainbond/worker/server/pb" workerutil "github.com/goodrain/rainbond/worker/util" "github.com/jinzhu/gorm" + "github.com/pkg/errors" monitorv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" "github.com/sirupsen/logrus" @@ -98,6 +98,7 @@ type Storer interface { GetAppResources(appID string) (int64, int64, error) GetHelmApp(namespace, name string) (*v1alpha1.HelmApp, error) ListPods(namespace string, selector labels.Selector) ([]*corev1.Pod, error) + ListReplicaSets(namespace string, selector labels.Selector) ([]*appsv1.ReplicaSet, error) ListServices(namespace string, selector labels.Selector) ([]*corev1.Service, error) } @@ -138,6 +139,7 @@ type appRuntimeStore struct { cancel context.CancelFunc informers *Informer listers *Lister + replicaSets *Lister appServices sync.Map appCount int32 dbmanager db.Manager @@ -221,6 +223,7 @@ func NewStore( store.listers.Ingress = infFactory.Extensions().V1beta1().Ingresses().Lister() store.informers.ReplicaSet = infFactory.Apps().V1().ReplicaSets().Informer() + store.listers.ReplicaSets = infFactory.Apps().V1().ReplicaSets().Lister() store.informers.Endpoints = infFactory.Core().V1().Endpoints().Informer() store.listers.Endpoints = infFactory.Core().V1().Endpoints().Lister() @@ -508,8 +511,7 @@ func (a *appRuntimeStore) checkReplicasetWhetherDelete(app *v1.AppService, rs *a //delete old version if v1.GetReplicaSetVersion(current) > v1.GetReplicaSetVersion(rs) { if rs.Status.Replicas == 0 && rs.Status.ReadyReplicas == 0 && rs.Status.AvailableReplicas == 0 { - if err := a.conf.KubeClient.AppsV1().ReplicaSets(rs.Namespace).Delete(context.Background(), rs.Name, metav1.DeleteOptions{}); - err != nil && k8sErrors.IsNotFound(err) { + if err := a.conf.KubeClient.AppsV1().ReplicaSets(rs.Namespace).Delete(context.Background(), rs.Name, metav1.DeleteOptions{}); err != nil && k8sErrors.IsNotFound(err) { logrus.Errorf("delete old version replicaset failure %s", err.Error()) } } @@ -1556,6 +1558,10 @@ func (a *appRuntimeStore) ListPods(namespace string, selector labels.Selector) ( return a.listers.Pod.Pods(namespace).List(selector) } +func (a *appRuntimeStore) ListReplicaSets(namespace string, selector labels.Selector) ([]*appsv1.ReplicaSet, error) { + return a.listers.ReplicaSets.ReplicaSets(namespace).List(selector) +} + func (a *appRuntimeStore) ListServices(namespace string, selector labels.Selector) ([]*corev1.Service, error) { return a.listers.Service.Services(namespace).List(selector) } diff --git a/worker/server/pb/app_runtime_server.pb.go b/worker/server/pb/app_runtime_server.pb.go index 59efa3bb0..4d8555948 100644 --- a/worker/server/pb/app_runtime_server.pb.go +++ b/worker/server/pb/app_runtime_server.pb.go @@ -2088,6 +2088,7 @@ type AppService struct { TcpPorts []int32 `protobuf:"varint,3,rep,packed,name=tcpPorts,proto3" json:"tcpPorts,omitempty"` UdpPorts []int32 `protobuf:"varint,4,rep,packed,name=udpPorts,proto3" json:"udpPorts,omitempty"` Pods []*AppService_Pod `protobuf:"bytes,5,rep,name=pods,proto3" json:"pods,omitempty"` + OldPods []*AppService_Pod `protobuf:"bytes,6,rep,name=oldPods,proto3" json:"oldPods,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -2153,6 +2154,13 @@ func (m *AppService) GetPods() []*AppService_Pod { return nil } +func (m *AppService) GetOldPods() []*AppService_Pod { + if m != nil { + return m.OldPods + } + return nil +} + type AppService_Pod struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Status string `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` @@ -2417,165 +2425,166 @@ func init() { func init() { proto.RegisterFile("app_runtime_server.proto", fileDescriptor_f94cf1a886c479d6) } var fileDescriptor_f94cf1a886c479d6 = []byte{ - // 2519 bytes of a gzipped FileDescriptorProto + // 2529 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, 0x44, 0x52, 0x10, 0x6c, 0x3d, 0xbc, 0x91, 0x54, - 0x2a, 0xc9, 0xa1, 0x25, 0xc6, 0x2a, 0x3d, 0xac, 0x38, 0x05, 0x01, 0x30, 0x85, 0x04, 0x04, 0x51, - 0x0b, 0xd0, 0x29, 0x57, 0xa5, 0x0a, 0xb5, 0xc4, 0x8e, 0xa9, 0x8d, 0xf6, 0x31, 0xde, 0x07, 0x1d, - 0x1c, 0x93, 0xbf, 0x90, 0x9f, 0x90, 0x83, 0x0f, 0xc9, 0x31, 0x95, 0xa3, 0xff, 0x41, 0x2a, 0x3f, - 0xc5, 0x17, 0xff, 0x80, 0x54, 0xcf, 0xcc, 0x3e, 0xb1, 0x94, 0xa2, 0x54, 0x52, 0xbe, 0x6d, 0xf7, - 0x74, 0x4f, 0xf7, 0xf4, 0xf4, 0xf4, 0x7c, 0x3d, 0x0b, 0x1d, 0x8d, 0xb1, 0x85, 0x1b, 0xd8, 0xbe, - 0x61, 0xd1, 0x85, 0x47, 0xdd, 0x0b, 0xea, 0x1e, 0x30, 0xd7, 0xf1, 0x1d, 0x52, 0x64, 0x67, 0x4a, - 0x15, 0xca, 0x43, 0x8b, 0xf9, 0x2b, 0xe5, 0x26, 0x54, 0x7a, 0x8c, 0xa9, 0xf4, 0x1b, 0xb2, 0x07, - 0x15, 0x54, 0x31, 0xf4, 0x4e, 0xe1, 0x56, 0xe1, 0x5e, 0x5d, 0x2d, 0x6b, 0x8c, 0x8d, 0x74, 0xe5, - 0x0e, 0x6c, 0xf5, 0x18, 0x9b, 0xf9, 0x9a, 0x1f, 0x78, 0x6f, 0x11, 0xfb, 0x04, 0x5a, 0x33, 0xea, - 0x5e, 0x18, 0x4b, 0xaa, 0xd2, 0x6f, 0x02, 0xea, 0xf9, 0xe4, 0x3a, 0x80, 0x27, 0x38, 0xb1, 0x70, - 0x5d, 0x72, 0x46, 0xba, 0x72, 0x08, 0xdb, 0x52, 0xc1, 0x0b, 0x35, 0x6e, 0x42, 0x23, 0xd6, 0xf0, - 0xa4, 0x0a, 0x44, 0x2a, 0x9e, 0xf2, 0x31, 0x34, 0xe7, 0xd4, 0xd6, 0x6c, 0x3f, 0xd4, 0xf8, 0x00, - 0xea, 0x3e, 0x67, 0xc4, 0x26, 0x6a, 0x82, 0x31, 0xd2, 0x95, 0x3f, 0x16, 0xa0, 0x29, 0xfc, 0x3e, - 0xa6, 0x9e, 0xa7, 0x9d, 0x53, 0xf2, 0x18, 0x2a, 0x1e, 0x67, 0x74, 0x0a, 0xb7, 0x4a, 0xf7, 0x1a, - 0x87, 0xd7, 0x0f, 0xd8, 0xd9, 0x41, 0x4a, 0x44, 0x52, 0x43, 0xdb, 0x77, 0x57, 0xaa, 0x14, 0xee, - 0x3e, 0x83, 0x46, 0x82, 0x4d, 0xda, 0x50, 0x7a, 0x43, 0x57, 0xd2, 0x1c, 0x7e, 0x92, 0x5d, 0x28, - 0x5f, 0x68, 0x66, 0x40, 0x3b, 0x45, 0x11, 0x12, 0x4e, 0x3c, 0x2f, 0x3e, 0x2d, 0x28, 0x2b, 0x68, - 0x0c, 0x0c, 0xef, 0x4d, 0xe8, 0xc0, 0x43, 0x28, 0xeb, 0x86, 0xf7, 0x26, 0xb4, 0xdf, 0x45, 0xfb, - 0x89, 0x71, 0xfe, 0x2d, 0x8d, 0x0b, 0xc1, 0xee, 0x53, 0x80, 0x98, 0xf9, 0x2e, 0xd3, 0x85, 0xa4, - 0x69, 0x0b, 0x76, 0x64, 0x80, 0x7b, 0x8c, 0x4d, 0x1d, 0x7d, 0x6c, 0x78, 0x3e, 0x79, 0x00, 0x55, - 0xc7, 0xd4, 0xa7, 0x8e, 0x1e, 0xba, 0xb0, 0xc3, 0x43, 0x90, 0x94, 0x53, 0x43, 0x09, 0x14, 0xb6, - 0xe9, 0xb7, 0x5c, 0xb8, 0x78, 0xa9, 0xb0, 0x94, 0x50, 0xbe, 0x2f, 0xc0, 0xfe, 0x71, 0x60, 0xfa, - 0xc6, 0xba, 0xd1, 0xe3, 0x68, 0x5f, 0x13, 0x86, 0x1f, 0xe0, 0x5c, 0xf9, 0x0a, 0xa1, 0x09, 0x94, - 0x16, 0xc1, 0x48, 0xea, 0x77, 0x4f, 0xa1, 0x9d, 0x15, 0xc8, 0x09, 0xcc, 0x83, 0x64, 0x60, 0x1a, - 0x87, 0x7b, 0x6b, 0xae, 0xa3, 0xa5, 0x64, 0xbc, 0x7e, 0x28, 0x42, 0x33, 0x25, 0xf0, 0x8e, 0x0c, - 0xc6, 0xe4, 0xd3, 0x29, 0x33, 0x9d, 0x15, 0x8e, 0x8a, 0x9d, 0xaf, 0x09, 0xc6, 0x48, 0xc7, 0x5c, - 0x96, 0x83, 0xfe, 0x8a, 0xd1, 0x4e, 0x49, 0xe4, 0xb2, 0x60, 0xcd, 0x57, 0x8c, 0x92, 0x6b, 0x50, - 0x63, 0x8e, 0xbe, 0xb0, 0x35, 0x8b, 0x76, 0x36, 0xf9, 0x68, 0x95, 0x39, 0xfa, 0x44, 0xb3, 0x28, - 0x1e, 0x31, 0x1c, 0x32, 0x58, 0xa7, 0x2c, 0xf2, 0x89, 0x39, 0xfa, 0x88, 0xa1, 0x3b, 0xc8, 0x96, - 0x19, 0x5c, 0x11, 0xee, 0x30, 0x47, 0x17, 0xb9, 0x49, 0x7a, 0x00, 0x4b, 0xc7, 0xf6, 0x35, 0xc3, - 0xa6, 0xae, 0xd7, 0xa9, 0xf2, 0x20, 0x7f, 0xb4, 0xb6, 0xea, 0x83, 0x7e, 0x24, 0x23, 0x42, 0x9b, - 0x50, 0x42, 0xa7, 0xd1, 0xc2, 0x85, 0x63, 0x06, 0x16, 0xf5, 0x3a, 0xb5, 0x5b, 0x25, 0x74, 0x9a, - 0x39, 0xfa, 0x97, 0x82, 0xd3, 0x1d, 0xc3, 0x76, 0x46, 0x3f, 0x27, 0xf2, 0x3f, 0x4b, 0x47, 0xbe, - 0x89, 0x3e, 0x44, 0x5a, 0xc9, 0x88, 0x5f, 0x40, 0x3d, 0xe2, 0x93, 0x3b, 0xd0, 0x8a, 0x3c, 0x11, - 0x51, 0x11, 0x53, 0x36, 0x23, 0x2e, 0x8f, 0xcd, 0x47, 0xb0, 0x65, 0x51, 0xcb, 0x71, 0x57, 0x0b, - 0xd3, 0xb0, 0x0c, 0x9f, 0xdb, 0x28, 0xa9, 0x0d, 0xc1, 0x1b, 0x23, 0x0b, 0x57, 0xb1, 0x64, 0xc1, - 0xc2, 0x15, 0x35, 0x82, 0x87, 0xbe, 0xa4, 0xc2, 0x92, 0x05, 0xb2, 0x6a, 0x28, 0x3f, 0x54, 0x00, - 0x06, 0x62, 0xa3, 0xec, 0xaf, 0x1d, 0xf2, 0x21, 0xd4, 0xd1, 0x9e, 0xc7, 0xb4, 0x65, 0x68, 0x34, - 0x66, 0x10, 0x05, 0xb6, 0x30, 0xe2, 0xf4, 0xeb, 0xc0, 0xa4, 0x1e, 0xf5, 0xe5, 0x46, 0xa7, 0x78, - 0xe4, 0x06, 0xc8, 0x9d, 0xb5, 0xa8, 0xed, 0xa7, 0xf7, 0x1a, 0x39, 0x3c, 0x91, 0x7c, 0xcd, 0xf5, - 0x17, 0x58, 0x8c, 0xe5, 0x6e, 0xd7, 0x39, 0x67, 0x6e, 0x58, 0x94, 0x7c, 0x0c, 0x9b, 0x0c, 0x0f, - 0x46, 0x99, 0xef, 0x59, 0x87, 0x17, 0x85, 0xc8, 0xbd, 0x83, 0xf8, 0x14, 0x70, 0x29, 0xf2, 0x14, - 0x6a, 0x32, 0x07, 0x31, 0x09, 0x50, 0xe3, 0xc3, 0x8c, 0x46, 0x58, 0x57, 0x85, 0x56, 0x24, 0x4d, - 0x3e, 0x83, 0x3a, 0xb5, 0x75, 0xe6, 0x18, 0xb6, 0x1f, 0x26, 0xc8, 0xf5, 0x8c, 0xea, 0x30, 0x1c, - 0x17, 0xba, 0xb1, 0x3c, 0x79, 0x0c, 0x55, 0x8f, 0x2e, 0x5d, 0xea, 0x8b, 0xbc, 0x68, 0x1c, 0x7e, - 0xb0, 0x66, 0x95, 0x8f, 0x0a, 0xc5, 0x50, 0x16, 0x6d, 0x1a, 0xf6, 0xb9, 0x4b, 0x3d, 0x8f, 0x7a, - 0x9d, 0x7a, 0xae, 0xcd, 0x51, 0x38, 0x2e, 0x6d, 0x46, 0xf2, 0xa4, 0x07, 0x0d, 0x97, 0x32, 0xd3, - 0x58, 0x6a, 0x3e, 0x86, 0x1e, 0xb8, 0xfa, 0xcd, 0x8c, 0xba, 0x1a, 0x4b, 0xc8, 0x62, 0x91, 0xd0, - 0x21, 0xfb, 0x51, 0xc9, 0x6f, 0xf0, 0xb0, 0x87, 0x35, 0xfd, 0x09, 0xd4, 0xdf, 0x56, 0x3d, 0x2e, - 0xad, 0xe8, 0xdd, 0xcf, 0xa2, 0x2a, 0xf1, 0x5f, 0x28, 0xbf, 0x80, 0x56, 0x3a, 0xc2, 0xef, 0xa5, - 0xfd, 0x1c, 0xb6, 0x92, 0x41, 0x7e, 0x5f, 0xcb, 0xe9, 0x38, 0xbf, 0x97, 0xf6, 0xe7, 0xd0, 0xce, - 0x86, 0xf9, 0xbd, 0xae, 0xc1, 0xbf, 0x15, 0xa1, 0x15, 0xde, 0xdc, 0x9e, 0x13, 0xb8, 0x4b, 0x9a, - 0x3d, 0xa5, 0x85, 0xec, 0x29, 0xc5, 0xf2, 0x8a, 0x02, 0xc9, 0x63, 0x5e, 0x5b, 0xb2, 0x40, 0x9c, - 0xf1, 0x3b, 0xd0, 0x92, 0x65, 0x20, 0x7d, 0xcc, 0x9b, 0x82, 0x1b, 0xce, 0x91, 0xad, 0x16, 0x9b, - 0xeb, 0xd5, 0xe2, 0x2e, 0x6c, 0xbb, 0x81, 0x6d, 0x1b, 0xf6, 0xf9, 0x02, 0x71, 0x8d, 0x1d, 0x58, - 0xbc, 0xea, 0x96, 0xd4, 0xa6, 0x64, 0xf7, 0x18, 0x9b, 0x04, 0x16, 0x79, 0x04, 0x7b, 0x49, 0x39, - 0xff, 0xb5, 0xe1, 0xea, 0x5c, 0x1a, 0xb8, 0x34, 0x89, 0xa5, 0xe7, 0x38, 0x84, 0x2a, 0x4f, 0xa0, - 0x93, 0x54, 0x31, 0x6c, 0x9f, 0xba, 0xb6, 0x66, 0x72, 0xad, 0x06, 0xd7, 0xda, 0x8b, 0xb5, 0x46, - 0x72, 0x74, 0x12, 0x58, 0xca, 0x5f, 0x0b, 0x40, 0xd2, 0xe1, 0xe2, 0xf7, 0x68, 0x1f, 0xea, 0xae, - 0xa4, 0xc3, 0x5b, 0xf4, 0x0e, 0x1e, 0x86, 0x75, 0xd1, 0x83, 0x90, 0x08, 0xcf, 0x54, 0xa4, 0xd7, - 0x9d, 0x42, 0x2b, 0x3d, 0x98, 0xb3, 0x91, 0xf7, 0xd2, 0x15, 0x9c, 0xac, 0x1b, 0x49, 0x6e, 0xee, - 0x9f, 0x0a, 0x70, 0xad, 0xa7, 0xeb, 0x7c, 0xd9, 0x53, 0xcd, 0xf5, 0x57, 0x51, 0x8a, 0x23, 0x5e, - 0x24, 0xb0, 0x19, 0x04, 0xd1, 0xf5, 0xc9, 0xbf, 0xd1, 0xa2, 0x17, 0xdd, 0x99, 0xf8, 0x49, 0x5a, - 0x50, 0x34, 0x98, 0xac, 0x9c, 0x45, 0x83, 0xa1, 0x16, 0x73, 0x5c, 0xb1, 0x61, 0x65, 0x95, 0x7f, - 0x63, 0x42, 0x18, 0xde, 0xc2, 0xb1, 0x4d, 0xc3, 0xa6, 0x7c, 0x8f, 0x6a, 0x6a, 0xcd, 0xf0, 0x4e, - 0x38, 0xcd, 0x9d, 0x38, 0x65, 0x3f, 0xb1, 0x13, 0x14, 0xae, 0x0d, 0xa8, 0xf9, 0xff, 0xf6, 0x41, - 0xf9, 0x33, 0xa6, 0xc7, 0x9a, 0x91, 0xff, 0xe1, 0x22, 0xe3, 0xa2, 0x59, 0x4e, 0x16, 0xcd, 0xf4, - 0xe2, 0x2b, 0x99, 0xc5, 0xff, 0x0a, 0xae, 0xe4, 0xac, 0x9c, 0xdc, 0x83, 0x92, 0x73, 0xf6, 0x7b, - 0x99, 0xae, 0xfb, 0x3c, 0x93, 0xd6, 0xa4, 0x54, 0x14, 0x51, 0x6e, 0x43, 0x1b, 0x73, 0x17, 0xcb, - 0xf2, 0xcb, 0xd5, 0x6c, 0x34, 0xc0, 0xa0, 0x49, 0xff, 0x0b, 0x91, 0xff, 0xca, 0xe7, 0xb0, 0x7d, - 0x44, 0x51, 0x68, 0x40, 0x7d, 0xcd, 0x30, 0x73, 0x85, 0x52, 0xe0, 0xaa, 0x98, 0x02, 0x57, 0xca, - 0x19, 0xd4, 0xa6, 0x8e, 0x3e, 0xbc, 0xa0, 0x22, 0x62, 0x1c, 0x9d, 0xc9, 0x88, 0xe1, 0x37, 0xae, - 0xdd, 0xa5, 0x9a, 0xe7, 0xd8, 0x52, 0x51, 0x52, 0x68, 0x44, 0x3b, 0x0f, 0x81, 0x1c, 0x7e, 0x92, - 0x0e, 0x54, 0x2d, 0x81, 0xdb, 0x65, 0x98, 0x42, 0x52, 0xf9, 0xbe, 0xc8, 0x6f, 0x17, 0x09, 0xcc, - 0xee, 0x26, 0xac, 0xb4, 0xc4, 0x61, 0x8a, 0x06, 0x0f, 0x10, 0x0b, 0xbe, 0xc3, 0x72, 0xc2, 0x4e, - 0x29, 0x65, 0x07, 0x35, 0x34, 0x1d, 0xaf, 0x22, 0x89, 0x29, 0x24, 0x85, 0xcb, 0xc7, 0x19, 0x17, - 0x9e, 0xef, 0x86, 0xae, 0x21, 0x3d, 0xf3, 0x5d, 0xe5, 0x2f, 0x05, 0xd8, 0xe4, 0xf8, 0xb3, 0x01, - 0xd5, 0xe9, 0x70, 0x32, 0x18, 0x4d, 0x8e, 0xda, 0x1b, 0x48, 0xa8, 0xa7, 0x93, 0x09, 0x12, 0x05, - 0xd2, 0x84, 0xfa, 0xec, 0xb4, 0xdf, 0x1f, 0x0e, 0x07, 0xc3, 0x41, 0xbb, 0x48, 0x00, 0x2a, 0x5f, - 0xf4, 0x46, 0xe3, 0xe1, 0xa0, 0x5d, 0x42, 0xb9, 0xd3, 0xc9, 0x6f, 0x26, 0x27, 0xbf, 0x9d, 0xb4, - 0x37, 0x49, 0x0b, 0x60, 0x3e, 0x3c, 0x1e, 0x4d, 0x7a, 0x73, 0xd4, 0x2b, 0x93, 0x2d, 0xa8, 0xf5, - 0x5e, 0x4e, 0x4e, 0xd4, 0xe3, 0xde, 0xb8, 0x5d, 0xc1, 0xd1, 0xd1, 0x64, 0x34, 0x1f, 0x89, 0xd1, - 0x2a, 0xd2, 0xb3, 0xfe, 0xab, 0xe1, 0xe0, 0x74, 0x8c, 0x74, 0x0d, 0xa5, 0x27, 0x27, 0x73, 0x75, - 0xd8, 0x1b, 0x7c, 0xd5, 0xae, 0xa3, 0xcd, 0xd3, 0xc9, 0xab, 0x61, 0x6f, 0x3c, 0x7f, 0xf5, 0x55, - 0x1b, 0x94, 0x1f, 0x0b, 0xb0, 0x35, 0x75, 0xf4, 0x18, 0x1d, 0xee, 0x42, 0xd9, 0xb0, 0x30, 0x02, - 0xb2, 0xe9, 0xe4, 0x04, 0x72, 0x39, 0x0e, 0x0b, 0x2f, 0x1c, 0x4e, 0x24, 0xe2, 0x58, 0xca, 0xc6, - 0x91, 0x63, 0x2e, 0xaa, 0x87, 0x80, 0x5b, 0x92, 0x78, 0x4d, 0xf0, 0xfb, 0x61, 0x21, 0x2e, 0x06, - 0x19, 0xb3, 0x06, 0xe7, 0x1d, 0x73, 0x16, 0xa6, 0xbe, 0x10, 0x59, 0xb2, 0x40, 0x62, 0xef, 0x1a, - 0x67, 0xf4, 0x59, 0x80, 0xb7, 0x91, 0xbc, 0x86, 0xc2, 0x19, 0xaa, 0x02, 0xbb, 0x4a, 0xae, 0x9c, - 0xe3, 0x26, 0xc2, 0x19, 0x21, 0x86, 0xb3, 0xd4, 0x04, 0x4e, 0x94, 0xac, 0x3e, 0x0b, 0x94, 0x7f, - 0x89, 0xbc, 0x11, 0x99, 0x8d, 0xd9, 0x99, 0xc0, 0xc1, 0xfc, 0x9b, 0xf3, 0x1c, 0x3d, 0x5c, 0x30, - 0xff, 0xce, 0xa0, 0xcb, 0x52, 0x16, 0x5d, 0xde, 0x89, 0x0e, 0xf3, 0x66, 0x8c, 0xc7, 0xa3, 0x04, - 0x8c, 0xce, 0xb6, 0xa8, 0x0b, 0xe5, 0xa8, 0x2e, 0x5c, 0x85, 0x2a, 0xce, 0x8e, 0x5d, 0x88, 0x58, - 0x6e, 0x05, 0xc9, 0x11, 0xc3, 0x30, 0x5e, 0x50, 0xd7, 0x33, 0x1c, 0x5b, 0xae, 0x32, 0x24, 0xc9, - 0x33, 0xd8, 0x36, 0x6c, 0x0c, 0x51, 0xdc, 0x86, 0x08, 0xa8, 0xd8, 0x96, 0x26, 0xe3, 0x2e, 0xa0, - 0x85, 0x82, 0x71, 0x2b, 0x41, 0x1e, 0xa6, 0x9a, 0x97, 0xfa, 0x25, 0x5a, 0xc9, 0x5e, 0xe5, 0x36, - 0x54, 0x28, 0x1e, 0x62, 0x4f, 0xc2, 0xc2, 0x2d, 0x29, 0xcd, 0x4f, 0xb6, 0x2a, 0xc7, 0x94, 0x17, - 0xd0, 0x9a, 0xf9, 0x8e, 0xab, 0x9d, 0xd3, 0xbe, 0xa9, 0x71, 0x4c, 0x79, 0x1f, 0x36, 0x4d, 0x83, - 0x03, 0x8e, 0xa8, 0x20, 0x25, 0x25, 0x64, 0x55, 0xe1, 0x32, 0xca, 0x77, 0x25, 0x20, 0xeb, 0x83, - 0xb9, 0x1b, 0x73, 0x0b, 0x1a, 0xcc, 0x75, 0x2e, 0x0c, 0x0c, 0x04, 0x75, 0xe5, 0xfe, 0x24, 0x59, - 0xe4, 0x0b, 0x00, 0xa6, 0xb9, 0x9a, 0x45, 0x7d, 0x5c, 0x62, 0x89, 0x9b, 0xbf, 0x9b, 0x6f, 0xfe, - 0x60, 0x1a, 0x09, 0xca, 0x26, 0x2d, 0xd6, 0x14, 0xc9, 0xb6, 0x34, 0x35, 0xc3, 0x5a, 0x30, 0xc7, - 0x34, 0x96, 0x2b, 0x99, 0xcd, 0x4d, 0xc9, 0x9d, 0x72, 0x26, 0xf9, 0x14, 0xf6, 0x35, 0xd3, 0x74, - 0xbe, 0x95, 0xdd, 0xdc, 0x82, 0xfe, 0x81, 0x69, 0x36, 0xdf, 0x35, 0x71, 0x6b, 0xed, 0xf2, 0x51, - 0xd1, 0xd8, 0x0d, 0xc3, 0x31, 0x72, 0x00, 0x57, 0xa4, 0xfc, 0x99, 0x61, 0xeb, 0x88, 0x5c, 0x2c, - 0x4c, 0x37, 0x91, 0x01, 0x3b, 0x62, 0xe8, 0xa5, 0x18, 0x39, 0xc6, 0xdc, 0x3b, 0x02, 0xc2, 0xe7, - 0xa1, 0xfa, 0xc2, 0x77, 0x98, 0x63, 0x3a, 0xe7, 0x06, 0x0d, 0x7b, 0x0b, 0xde, 0xc8, 0xcc, 0x05, - 0x77, 0x35, 0xa3, 0x26, 0x5d, 0xfa, 0x8e, 0x3b, 0xa7, 0xae, 0xa5, 0xee, 0x48, 0x9d, 0x79, 0xa4, - 0xd2, 0xfd, 0x25, 0x6c, 0x67, 0x16, 0xfd, 0x5e, 0x00, 0xd3, 0x87, 0xdd, 0x3c, 0x4b, 0xe4, 0x77, - 0x70, 0xd5, 0xd2, 0xfc, 0xe5, 0xeb, 0x85, 0xa9, 0x9d, 0x51, 0x13, 0x83, 0x80, 0x10, 0xd8, 0x70, - 0xec, 0x10, 0x40, 0xdd, 0xce, 0x73, 0x72, 0x8c, 0xc2, 0x88, 0x21, 0x0d, 0x97, 0x62, 0x03, 0xa7, - 0xee, 0xf1, 0x49, 0x38, 0x7b, 0x18, 0x4f, 0xa1, 0x8c, 0xe1, 0xd6, 0xbb, 0x54, 0x73, 0x56, 0xb1, - 0x0f, 0x15, 0xee, 0xb8, 0x78, 0x55, 0xa9, 0xab, 0x92, 0x52, 0xfe, 0x5e, 0x80, 0xae, 0x6c, 0x2d, - 0xc4, 0xb6, 0xa4, 0x1f, 0xaf, 0x5e, 0x66, 0x1e, 0xaf, 0xee, 0x27, 0x7a, 0xfb, 0x1c, 0xf9, 0xdc, - 0x97, 0x2c, 0xf5, 0x5d, 0x2f, 0x59, 0x3f, 0x4f, 0x46, 0xb8, 0x75, 0x78, 0xf5, 0x12, 0x1b, 0xc9, - 0xd0, 0x7f, 0x57, 0x84, 0x7a, 0xf4, 0x42, 0x98, 0x80, 0x0e, 0x85, 0x14, 0x74, 0x68, 0x43, 0x09, - 0x6b, 0x9e, 0xc0, 0xf1, 0xf8, 0x89, 0x92, 0xb2, 0x58, 0x0a, 0xe8, 0x2e, 0x29, 0x3e, 0x03, 0xf5, - 0xfb, 0xd3, 0x53, 0x9e, 0xd7, 0x35, 0x55, 0x52, 0xd8, 0xa6, 0x7b, 0x54, 0x96, 0x52, 0x99, 0xc3, - 0x31, 0x03, 0x53, 0x83, 0xbd, 0xd6, 0xbc, 0x30, 0x55, 0x05, 0x81, 0x3a, 0xce, 0x05, 0x75, 0x5d, - 0x43, 0x97, 0x59, 0x59, 0x57, 0x63, 0x46, 0xb2, 0x92, 0xd5, 0x52, 0x95, 0x4c, 0x99, 0x43, 0x45, - 0xae, 0xa7, 0x0a, 0xa5, 0xc9, 0x68, 0x9c, 0xbd, 0x22, 0x01, 0x2a, 0xfd, 0xf1, 0xc9, 0x8c, 0xdf, - 0x8f, 0xc9, 0x6b, 0xaf, 0x84, 0xd4, 0x6c, 0xde, 0x53, 0xf9, 0xa5, 0xb7, 0x29, 0xa8, 0x93, 0xe9, - 0x94, 0x5f, 0x90, 0xca, 0x1c, 0x48, 0x8f, 0xb1, 0x01, 0xf5, 0xe9, 0x12, 0x6b, 0x9f, 0x6e, 0xf8, - 0x78, 0xe4, 0xf2, 0x40, 0xc8, 0x2e, 0x94, 0x5d, 0xaa, 0xe9, 0x2b, 0x1e, 0xaf, 0x9a, 0x2a, 0x08, - 0xe4, 0x52, 0xd7, 0x75, 0x5c, 0x59, 0xe3, 0x05, 0xa1, 0xfc, 0xb3, 0x00, 0x80, 0xf1, 0x17, 0xbb, - 0x94, 0x5b, 0x9c, 0x3a, 0x50, 0xd5, 0x74, 0x1d, 0xd3, 0x36, 0x44, 0x43, 0x92, 0x24, 0x5d, 0xa8, - 0xf9, 0x4b, 0x36, 0x75, 0x5c, 0x5f, 0x94, 0xa4, 0xb2, 0x1a, 0xd1, 0x38, 0x16, 0xe8, 0x72, 0x6c, - 0x53, 0x8c, 0x85, 0x34, 0x62, 0x9a, 0xc4, 0x93, 0x05, 0xc7, 0x34, 0xb1, 0x0f, 0x58, 0x86, 0xc5, - 0x63, 0x45, 0xf7, 0x11, 0x94, 0xa6, 0x8e, 0x9e, 0xeb, 0x54, 0x9c, 0x29, 0xc5, 0x64, 0xa6, 0x28, - 0xcf, 0xa0, 0x11, 0x4f, 0x85, 0xf5, 0x3a, 0x7e, 0xee, 0x10, 0x89, 0xdf, 0x4a, 0x5b, 0x8b, 0x1f, - 0x38, 0x94, 0x63, 0xd8, 0x7e, 0x45, 0x4d, 0x8b, 0x3f, 0x68, 0x9b, 0x54, 0xc3, 0x72, 0xff, 0x1c, - 0x5a, 0xaf, 0x53, 0x2c, 0x39, 0x09, 0x77, 0x39, 0x2d, 0xac, 0x66, 0x24, 0x95, 0x7f, 0x14, 0xa0, - 0x95, 0x16, 0xc1, 0x98, 0xb8, 0x54, 0x94, 0x74, 0xbe, 0x98, 0xb2, 0x1a, 0xd1, 0x18, 0xe5, 0x80, - 0xe9, 0x1a, 0xe2, 0x0b, 0x19, 0x65, 0x49, 0x26, 0x96, 0x5a, 0x4a, 0x1d, 0x8a, 0x5d, 0x28, 0x2f, - 0x5f, 0x6b, 0x12, 0x7c, 0xd7, 0x55, 0x41, 0x90, 0x1b, 0x00, 0x1a, 0x63, 0x5f, 0xca, 0xcc, 0x14, - 0x37, 0x72, 0x82, 0x83, 0x57, 0x8d, 0x4e, 0xbd, 0xa5, 0x6b, 0x30, 0xcc, 0x1f, 0x99, 0xf0, 0x49, - 0xd6, 0xfd, 0x4f, 0xe0, 0x4a, 0xce, 0xa1, 0x25, 0x75, 0x28, 0x0b, 0xbc, 0xb5, 0x81, 0x78, 0x6b, - 0x72, 0x32, 0x5f, 0x08, 0xb2, 0x70, 0xf8, 0x63, 0x15, 0x5a, 0xb8, 0x4a, 0xf1, 0xbb, 0x60, 0xb6, - 0xb2, 0x97, 0xe4, 0x25, 0xec, 0x1f, 0x51, 0x3f, 0x3a, 0xd8, 0x03, 0xca, 0x5c, 0xba, 0xe4, 0xab, - 0xb9, 0x92, 0x28, 0x0a, 0xe1, 0xdb, 0x7d, 0x77, 0x67, 0xed, 0x29, 0x5d, 0xd9, 0x20, 0x8f, 0x60, - 0x2b, 0x39, 0x07, 0x69, 0x87, 0x3b, 0x17, 0xfe, 0x4d, 0xe8, 0x36, 0x53, 0x1c, 0x65, 0x83, 0x3c, - 0x03, 0x10, 0x2a, 0xfc, 0x05, 0x9a, 0x24, 0x4c, 0x85, 0x96, 0xf2, 0x5f, 0x72, 0x95, 0x0d, 0x32, - 0xe0, 0x9d, 0x01, 0x7f, 0x52, 0x0e, 0xf5, 0x73, 0x5d, 0xed, 0x5e, 0xfe, 0xf2, 0xac, 0x6c, 0x90, - 0xc7, 0xd0, 0x3c, 0xa2, 0x7e, 0xe2, 0x79, 0x30, 0xcf, 0x87, 0x56, 0xfa, 0x0d, 0x4a, 0xd9, 0x20, - 0x2f, 0x60, 0xe7, 0x88, 0xfa, 0x99, 0x37, 0x8e, 0x9d, 0x64, 0xe3, 0x2c, 0x34, 0x73, 0x7a, 0x69, - 0xbe, 0x6a, 0xb2, 0xa6, 0xed, 0x91, 0x3a, 0xca, 0xf2, 0xdf, 0x34, 0xdd, 0xfd, 0xfc, 0x3e, 0x5f, - 0xd9, 0x20, 0xaf, 0xe0, 0x2a, 0x7e, 0xe5, 0xb5, 0x5e, 0x79, 0x9e, 0x5f, 0xcd, 0xef, 0xc0, 0x30, - 0xf4, 0x7d, 0xd8, 0xcb, 0x6d, 0xe3, 0x09, 0x7f, 0xb0, 0xbb, 0xb4, 0xc3, 0xef, 0xc6, 0x6e, 0x8a, - 0x49, 0x72, 0xdb, 0x70, 0x31, 0xc9, 0xa5, 0x1d, 0xfa, 0xda, 0x24, 0xb9, 0x7d, 0x34, 0x91, 0x4f, - 0x87, 0xe6, 0x7f, 0x32, 0xc9, 0xa7, 0x3c, 0xf9, 0x62, 0x38, 0xcd, 0x73, 0x21, 0xd3, 0x3a, 0x76, - 0x43, 0x30, 0x2c, 0x38, 0x5c, 0x0b, 0xf7, 0x31, 0x83, 0x19, 0x13, 0x1b, 0x41, 0xb2, 0x88, 0x8d, - 0x62, 0xe8, 0x7e, 0xcd, 0xf7, 0xaf, 0xc7, 0x58, 0xea, 0xbc, 0xe5, 0xc5, 0xff, 0xc6, 0xdb, 0x6f, - 0x6d, 0x65, 0x83, 0x3c, 0x84, 0x6d, 0xdc, 0xd0, 0x64, 0x0d, 0x04, 0x79, 0x4a, 0xd0, 0xe3, 0xed, - 0x74, 0xf5, 0x43, 0xeb, 0x4f, 0x80, 0xa0, 0x46, 0xa6, 0x54, 0x25, 0x95, 0xae, 0xac, 0x57, 0x3b, - 0x4f, 0xd9, 0x38, 0xab, 0xf0, 0x1f, 0x82, 0xbf, 0xf8, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x35, - 0xb4, 0x2d, 0x83, 0x2c, 0x1c, 0x00, 0x00, + 0xf1, 0x27, 0x00, 0xe2, 0xd5, 0x20, 0x40, 0x70, 0x44, 0x52, 0x10, 0x6c, 0x3d, 0xbc, 0x7f, 0x49, + 0xa5, 0x92, 0xf4, 0xa7, 0x25, 0xc6, 0x2a, 0x3d, 0xac, 0x38, 0x05, 0x01, 0x30, 0x85, 0x04, 0x04, + 0x51, 0x0b, 0xd0, 0x29, 0x57, 0xa5, 0x0a, 0xb5, 0xc4, 0x8e, 0xa9, 0x8d, 0xf6, 0x31, 0xde, 0x07, + 0x1d, 0x1c, 0x93, 0xaf, 0x90, 0x8f, 0x90, 0x83, 0x0f, 0xc9, 0x31, 0x95, 0xa3, 0xbf, 0x42, 0x3e, + 0x8a, 0x2f, 0xbe, 0xe5, 0x92, 0xea, 0x99, 0xd9, 0x27, 0x96, 0x52, 0x94, 0x4a, 0x2a, 0xb7, 0xed, + 0x9e, 0x5f, 0x4f, 0xf7, 0xf4, 0xf4, 0xf4, 0x74, 0xcf, 0x42, 0x47, 0x63, 0x6c, 0xe1, 0x06, 0xb6, + 0x6f, 0x58, 0x74, 0xe1, 0x51, 0xf7, 0x82, 0xba, 0x07, 0xcc, 0x75, 0x7c, 0x87, 0x14, 0xd9, 0x99, + 0x52, 0x85, 0xf2, 0xd0, 0x62, 0xfe, 0x4a, 0xb9, 0x09, 0x95, 0x1e, 0x63, 0x2a, 0xfd, 0x96, 0xec, + 0x41, 0x05, 0x45, 0x0c, 0xbd, 0x53, 0xb8, 0x55, 0xb8, 0x57, 0x57, 0xcb, 0x1a, 0x63, 0x23, 0x5d, + 0xb9, 0x03, 0x5b, 0x3d, 0xc6, 0x66, 0xbe, 0xe6, 0x07, 0xde, 0x3b, 0x60, 0x9f, 0x42, 0x6b, 0x46, + 0xdd, 0x0b, 0x63, 0x49, 0x55, 0xfa, 0x6d, 0x40, 0x3d, 0x9f, 0x5c, 0x07, 0xf0, 0x04, 0x27, 0x06, + 0xd7, 0x25, 0x67, 0xa4, 0x2b, 0x87, 0xb0, 0x2d, 0x05, 0xbc, 0x50, 0xe2, 0x26, 0x34, 0x62, 0x09, + 0x4f, 0x8a, 0x40, 0x24, 0xe2, 0x29, 0x0f, 0xa1, 0x39, 0xa7, 0xb6, 0x66, 0xfb, 0xa1, 0xc4, 0x47, + 0x50, 0xf7, 0x39, 0x23, 0x56, 0x51, 0x13, 0x8c, 0x91, 0xae, 0xfc, 0xbe, 0x00, 0x4d, 0x61, 0xf7, + 0x31, 0xf5, 0x3c, 0xed, 0x9c, 0x92, 0x27, 0x50, 0xf1, 0x38, 0xa3, 0x53, 0xb8, 0x55, 0xba, 0xd7, + 0x38, 0xbc, 0x7e, 0xc0, 0xce, 0x0e, 0x52, 0x10, 0x49, 0x0d, 0x6d, 0xdf, 0x5d, 0xa9, 0x12, 0xdc, + 0x7d, 0x0e, 0x8d, 0x04, 0x9b, 0xb4, 0xa1, 0xf4, 0x96, 0xae, 0xa4, 0x3a, 0xfc, 0x24, 0xbb, 0x50, + 0xbe, 0xd0, 0xcc, 0x80, 0x76, 0x8a, 0xc2, 0x25, 0x9c, 0x78, 0x51, 0x7c, 0x56, 0x50, 0x56, 0xd0, + 0x18, 0x18, 0xde, 0xdb, 0xd0, 0x80, 0x47, 0x50, 0xd6, 0x0d, 0xef, 0x6d, 0xa8, 0xbf, 0x8b, 0xfa, + 0x13, 0xe3, 0xfc, 0x5b, 0x2a, 0x17, 0xc0, 0xee, 0x33, 0x80, 0x98, 0xf9, 0x3e, 0xd5, 0x85, 0xa4, + 0x6a, 0x0b, 0x76, 0xa4, 0x83, 0x7b, 0x8c, 0x4d, 0x1d, 0x7d, 0x6c, 0x78, 0x3e, 0x79, 0x00, 0x55, + 0xc7, 0xd4, 0xa7, 0x8e, 0x1e, 0x9a, 0xb0, 0xc3, 0x5d, 0x90, 0xc4, 0xa9, 0x21, 0x02, 0xc1, 0x36, + 0xfd, 0x8e, 0x83, 0x8b, 0x97, 0x82, 0x25, 0x42, 0xf9, 0xa1, 0x00, 0xfb, 0xc7, 0x81, 0xe9, 0x1b, + 0xeb, 0x4a, 0x8f, 0xa3, 0x7d, 0x4d, 0x28, 0x7e, 0x80, 0x73, 0xe5, 0x0b, 0x84, 0x2a, 0x10, 0x2d, + 0x9c, 0x91, 0x94, 0xef, 0x9e, 0x42, 0x3b, 0x0b, 0xc8, 0x71, 0xcc, 0x83, 0xa4, 0x63, 0x1a, 0x87, + 0x7b, 0x6b, 0xa6, 0xa3, 0xa6, 0xa4, 0xbf, 0x7e, 0x2c, 0x42, 0x33, 0x05, 0x78, 0x4f, 0x04, 0x63, + 0xf0, 0xe9, 0x94, 0x99, 0xce, 0x0a, 0x47, 0xc5, 0xce, 0xd7, 0x04, 0x63, 0xa4, 0x63, 0x2c, 0xcb, + 0x41, 0x7f, 0xc5, 0x68, 0xa7, 0x24, 0x62, 0x59, 0xb0, 0xe6, 0x2b, 0x46, 0xc9, 0x35, 0xa8, 0x31, + 0x47, 0x5f, 0xd8, 0x9a, 0x45, 0x3b, 0x9b, 0x7c, 0xb4, 0xca, 0x1c, 0x7d, 0xa2, 0x59, 0x14, 0x8f, + 0x18, 0x0e, 0x19, 0xac, 0x53, 0x16, 0xf1, 0xc4, 0x1c, 0x7d, 0xc4, 0xd0, 0x1c, 0x64, 0xcb, 0x08, + 0xae, 0x08, 0x73, 0x98, 0xa3, 0x8b, 0xd8, 0x24, 0x3d, 0x80, 0xa5, 0x63, 0xfb, 0x9a, 0x61, 0x53, + 0xd7, 0xeb, 0x54, 0xb9, 0x93, 0x3f, 0x59, 0x5b, 0xf5, 0x41, 0x3f, 0xc2, 0x08, 0xd7, 0x26, 0x84, + 0xd0, 0x68, 0xd4, 0x70, 0xe1, 0x98, 0x81, 0x45, 0xbd, 0x4e, 0xed, 0x56, 0x09, 0x8d, 0x66, 0x8e, + 0xfe, 0x95, 0xe0, 0x74, 0xc7, 0xb0, 0x9d, 0x91, 0xcf, 0xf1, 0xfc, 0xff, 0xa5, 0x3d, 0xdf, 0x44, + 0x1b, 0x22, 0xa9, 0xa4, 0xc7, 0x2f, 0xa0, 0x1e, 0xf1, 0xc9, 0x1d, 0x68, 0x45, 0x96, 0x08, 0xaf, + 0x88, 0x29, 0x9b, 0x11, 0x97, 0xfb, 0xe6, 0x13, 0xd8, 0xb2, 0xa8, 0xe5, 0xb8, 0xab, 0x85, 0x69, + 0x58, 0x86, 0xcf, 0x75, 0x94, 0xd4, 0x86, 0xe0, 0x8d, 0x91, 0x85, 0xab, 0x58, 0xb2, 0x60, 0xe1, + 0x8a, 0x1c, 0xc1, 0x5d, 0x5f, 0x52, 0x61, 0xc9, 0x02, 0x99, 0x35, 0x94, 0x1f, 0x2b, 0x00, 0x03, + 0xb1, 0x51, 0xf6, 0x37, 0x0e, 0xf9, 0x18, 0xea, 0xa8, 0xcf, 0x63, 0xda, 0x32, 0x54, 0x1a, 0x33, + 0x88, 0x02, 0x5b, 0xe8, 0x71, 0xfa, 0x4d, 0x60, 0x52, 0x8f, 0xfa, 0x72, 0xa3, 0x53, 0x3c, 0x72, + 0x03, 0xe4, 0xce, 0x5a, 0xd4, 0xf6, 0xd3, 0x7b, 0x8d, 0x1c, 0x1e, 0x48, 0xbe, 0xe6, 0xfa, 0x0b, + 0x4c, 0xc6, 0x72, 0xb7, 0xeb, 0x9c, 0x33, 0x37, 0x2c, 0x4a, 0x1e, 0xc2, 0x26, 0xc3, 0x83, 0x51, + 0xe6, 0x7b, 0xd6, 0xe1, 0x49, 0x21, 0x32, 0xef, 0x20, 0x3e, 0x05, 0x1c, 0x45, 0x9e, 0x41, 0x4d, + 0xc6, 0x20, 0x06, 0x01, 0x4a, 0x7c, 0x9c, 0x91, 0x08, 0xf3, 0xaa, 0x90, 0x8a, 0xd0, 0xe4, 0x73, + 0xa8, 0x53, 0x5b, 0x67, 0x8e, 0x61, 0xfb, 0x61, 0x80, 0x5c, 0xcf, 0x88, 0x0e, 0xc3, 0x71, 0x21, + 0x1b, 0xe3, 0xc9, 0x13, 0xa8, 0x7a, 0x74, 0xe9, 0x52, 0x5f, 0xc4, 0x45, 0xe3, 0xf0, 0xa3, 0x35, + 0xad, 0x7c, 0x54, 0x08, 0x86, 0x58, 0xd4, 0x69, 0xd8, 0xe7, 0x2e, 0xf5, 0x3c, 0xea, 0x75, 0xea, + 0xb9, 0x3a, 0x47, 0xe1, 0xb8, 0xd4, 0x19, 0xe1, 0x49, 0x0f, 0x1a, 0x2e, 0x65, 0xa6, 0xb1, 0xd4, + 0x7c, 0x74, 0x3d, 0x70, 0xf1, 0x9b, 0x19, 0x71, 0x35, 0x46, 0xc8, 0x64, 0x91, 0x90, 0x21, 0xfb, + 0x51, 0xca, 0x6f, 0x70, 0xb7, 0x87, 0x39, 0xfd, 0x29, 0xd4, 0xdf, 0x95, 0x3d, 0x2e, 0xcd, 0xe8, + 0xdd, 0xcf, 0xa3, 0x2c, 0xf1, 0x6f, 0x08, 0xbf, 0x84, 0x56, 0xda, 0xc3, 0x1f, 0x24, 0xfd, 0x02, + 0xb6, 0x92, 0x4e, 0xfe, 0x50, 0xcd, 0x69, 0x3f, 0x7f, 0x90, 0xf4, 0x17, 0xd0, 0xce, 0xba, 0xf9, + 0x83, 0xae, 0xc1, 0xbf, 0x14, 0xa1, 0x15, 0xde, 0xdc, 0x9e, 0x13, 0xb8, 0x4b, 0x9a, 0x3d, 0xa5, + 0x85, 0xec, 0x29, 0xc5, 0xf4, 0x8a, 0x80, 0xe4, 0x31, 0xaf, 0x2d, 0x59, 0x20, 0xce, 0xf8, 0x1d, + 0x68, 0xc9, 0x34, 0x90, 0x3e, 0xe6, 0x4d, 0xc1, 0x0d, 0xe7, 0xc8, 0x66, 0x8b, 0xcd, 0xf5, 0x6c, + 0x71, 0x17, 0xb6, 0xdd, 0xc0, 0xb6, 0x0d, 0xfb, 0x7c, 0x81, 0x75, 0x8d, 0x1d, 0x58, 0x3c, 0xeb, + 0x96, 0xd4, 0xa6, 0x64, 0xf7, 0x18, 0x9b, 0x04, 0x16, 0x79, 0x0c, 0x7b, 0x49, 0x9c, 0xff, 0xc6, + 0x70, 0x75, 0x8e, 0x06, 0x8e, 0x26, 0x31, 0x7a, 0x8e, 0x43, 0x28, 0xf2, 0x14, 0x3a, 0x49, 0x11, + 0xc3, 0xf6, 0xa9, 0x6b, 0x6b, 0x26, 0x97, 0x6a, 0x70, 0xa9, 0xbd, 0x58, 0x6a, 0x24, 0x47, 0x27, + 0x81, 0xa5, 0xfc, 0xb9, 0x00, 0x24, 0xed, 0x2e, 0x7e, 0x8f, 0xf6, 0xa1, 0xee, 0x4a, 0x3a, 0xbc, + 0x45, 0xef, 0xe0, 0x61, 0x58, 0x87, 0x1e, 0x84, 0x44, 0x78, 0xa6, 0x22, 0xb9, 0xee, 0x14, 0x5a, + 0xe9, 0xc1, 0x9c, 0x8d, 0xbc, 0x97, 0xce, 0xe0, 0x64, 0x5d, 0x49, 0x72, 0x73, 0xff, 0x50, 0x80, + 0x6b, 0x3d, 0x5d, 0xe7, 0xcb, 0x9e, 0x6a, 0xae, 0xbf, 0x8a, 0x42, 0x1c, 0xeb, 0x45, 0x02, 0x9b, + 0x41, 0x10, 0x5d, 0x9f, 0xfc, 0x1b, 0x35, 0x7a, 0xd1, 0x9d, 0x89, 0x9f, 0xa4, 0x05, 0x45, 0x83, + 0xc9, 0xcc, 0x59, 0x34, 0x18, 0x4a, 0x31, 0xc7, 0x15, 0x1b, 0x56, 0x56, 0xf9, 0x37, 0x06, 0x84, + 0xe1, 0x2d, 0x1c, 0xdb, 0x34, 0x6c, 0xca, 0xf7, 0xa8, 0xa6, 0xd6, 0x0c, 0xef, 0x84, 0xd3, 0xdc, + 0x88, 0x53, 0xf6, 0x3f, 0x36, 0x82, 0xc2, 0xb5, 0x01, 0x35, 0xff, 0xdb, 0x36, 0x28, 0x7f, 0xc4, + 0xf0, 0x58, 0x53, 0xf2, 0x1f, 0x5c, 0x64, 0x9c, 0x34, 0xcb, 0xc9, 0xa4, 0x99, 0x5e, 0x7c, 0x25, + 0xb3, 0xf8, 0x5f, 0xc0, 0x95, 0x9c, 0x95, 0x93, 0x7b, 0x50, 0x72, 0xce, 0x7e, 0x2b, 0xc3, 0x75, + 0x9f, 0x47, 0xd2, 0x1a, 0x4a, 0x45, 0x88, 0x72, 0x1b, 0xda, 0x18, 0xbb, 0x98, 0x96, 0x5f, 0xad, + 0x66, 0xa3, 0x01, 0x3a, 0x4d, 0xda, 0x5f, 0x88, 0xec, 0x57, 0xbe, 0x80, 0xed, 0x23, 0x8a, 0xa0, + 0x01, 0xf5, 0x35, 0xc3, 0xcc, 0x05, 0xa5, 0x8a, 0xab, 0x62, 0xaa, 0xb8, 0x52, 0xce, 0xa0, 0x36, + 0x75, 0xf4, 0xe1, 0x05, 0x15, 0x1e, 0xe3, 0xd5, 0x99, 0xf4, 0x18, 0x7e, 0xe3, 0xda, 0x5d, 0xaa, + 0x79, 0x8e, 0x2d, 0x05, 0x25, 0x85, 0x4a, 0xb4, 0xf3, 0xb0, 0x90, 0xc3, 0x4f, 0xd2, 0x81, 0xaa, + 0x25, 0xea, 0x76, 0xe9, 0xa6, 0x90, 0x54, 0x7e, 0x28, 0xf2, 0xdb, 0x45, 0x16, 0x66, 0x77, 0x13, + 0x5a, 0x5a, 0xe2, 0x30, 0x45, 0x83, 0x07, 0x58, 0x0b, 0xbe, 0x47, 0x73, 0x42, 0x4f, 0x29, 0xa5, + 0x07, 0x25, 0x34, 0x1d, 0xaf, 0x22, 0x59, 0x53, 0x48, 0x0a, 0x97, 0x8f, 0x33, 0x2e, 0x3c, 0xdf, + 0x0d, 0x4d, 0x43, 0x7a, 0xe6, 0xbb, 0xca, 0x9f, 0x0a, 0xb0, 0xc9, 0xeb, 0xcf, 0x06, 0x54, 0xa7, + 0xc3, 0xc9, 0x60, 0x34, 0x39, 0x6a, 0x6f, 0x20, 0xa1, 0x9e, 0x4e, 0x26, 0x48, 0x14, 0x48, 0x13, + 0xea, 0xb3, 0xd3, 0x7e, 0x7f, 0x38, 0x1c, 0x0c, 0x07, 0xed, 0x22, 0x01, 0xa8, 0x7c, 0xd9, 0x1b, + 0x8d, 0x87, 0x83, 0x76, 0x09, 0x71, 0xa7, 0x93, 0x5f, 0x4d, 0x4e, 0x7e, 0x3d, 0x69, 0x6f, 0x92, + 0x16, 0xc0, 0x7c, 0x78, 0x3c, 0x9a, 0xf4, 0xe6, 0x28, 0x57, 0x26, 0x5b, 0x50, 0xeb, 0xbd, 0x9a, + 0x9c, 0xa8, 0xc7, 0xbd, 0x71, 0xbb, 0x82, 0xa3, 0xa3, 0xc9, 0x68, 0x3e, 0x12, 0xa3, 0x55, 0xa4, + 0x67, 0xfd, 0xd7, 0xc3, 0xc1, 0xe9, 0x18, 0xe9, 0x1a, 0xa2, 0x27, 0x27, 0x73, 0x75, 0xd8, 0x1b, + 0x7c, 0xdd, 0xae, 0xa3, 0xce, 0xd3, 0xc9, 0xeb, 0x61, 0x6f, 0x3c, 0x7f, 0xfd, 0x75, 0x1b, 0x94, + 0x9f, 0x0a, 0xb0, 0x35, 0x75, 0xf4, 0xb8, 0x3a, 0xdc, 0x85, 0xb2, 0x61, 0xa1, 0x07, 0x64, 0xd3, + 0xc9, 0x09, 0xe4, 0xf2, 0x3a, 0x2c, 0xbc, 0x70, 0x38, 0x91, 0xf0, 0x63, 0x29, 0xeb, 0x47, 0x5e, + 0x73, 0x51, 0x3d, 0x2c, 0xb8, 0x25, 0x89, 0xd7, 0x04, 0xbf, 0x1f, 0x16, 0xe2, 0x62, 0x90, 0x3e, + 0x6b, 0x70, 0xde, 0x31, 0x67, 0x61, 0xe8, 0x0b, 0xc8, 0x92, 0x05, 0xb2, 0xf6, 0xae, 0x71, 0x46, + 0x9f, 0x05, 0x78, 0x1b, 0xc9, 0x6b, 0x28, 0x9c, 0xa1, 0x2a, 0x6a, 0x57, 0xc9, 0x95, 0x73, 0xdc, + 0xc4, 0x72, 0x46, 0xc0, 0x70, 0x96, 0x9a, 0xa8, 0x13, 0x25, 0xab, 0xcf, 0x02, 0xe5, 0xef, 0x22, + 0x6e, 0x44, 0x64, 0x63, 0x74, 0x26, 0xea, 0x60, 0xfe, 0xcd, 0x79, 0x8e, 0x1e, 0x2e, 0x98, 0x7f, + 0x67, 0xaa, 0xcb, 0x52, 0xb6, 0xba, 0xbc, 0x13, 0x1d, 0xe6, 0xcd, 0xb8, 0x1e, 0x8f, 0x02, 0x30, + 0x3a, 0xdb, 0x22, 0x2f, 0x94, 0xa3, 0xbc, 0x70, 0x15, 0xaa, 0x38, 0x3b, 0x76, 0x21, 0x62, 0xb9, + 0x15, 0x24, 0x47, 0x0c, 0xdd, 0x78, 0x41, 0x5d, 0xcf, 0x70, 0x6c, 0xb9, 0xca, 0x90, 0x24, 0xcf, + 0x61, 0xdb, 0xb0, 0xd1, 0x45, 0x71, 0x1b, 0x22, 0x4a, 0xc5, 0xb6, 0x54, 0x19, 0x77, 0x01, 0x2d, + 0x04, 0xc6, 0xad, 0x04, 0x79, 0x94, 0x6a, 0x5e, 0xea, 0x97, 0x48, 0x25, 0x7b, 0x95, 0xdb, 0x50, + 0xa1, 0x78, 0x88, 0x3d, 0x59, 0x16, 0x6e, 0x49, 0x34, 0x3f, 0xd9, 0xaa, 0x1c, 0x53, 0x5e, 0x42, + 0x6b, 0xe6, 0x3b, 0xae, 0x76, 0x4e, 0xfb, 0xa6, 0xc6, 0x6b, 0xca, 0xfb, 0xb0, 0x69, 0x1a, 0xbc, + 0xe0, 0x88, 0x12, 0x52, 0x12, 0x21, 0xb3, 0x0a, 0xc7, 0x28, 0xdf, 0x97, 0x80, 0xac, 0x0f, 0xe6, + 0x6e, 0xcc, 0x2d, 0x68, 0x30, 0xd7, 0xb9, 0x30, 0xd0, 0x11, 0xd4, 0x95, 0xfb, 0x93, 0x64, 0x91, + 0x2f, 0x01, 0x98, 0xe6, 0x6a, 0x16, 0xf5, 0x71, 0x89, 0x25, 0xae, 0xfe, 0x6e, 0xbe, 0xfa, 0x83, + 0x69, 0x04, 0x94, 0x4d, 0x5a, 0x2c, 0x29, 0x82, 0x6d, 0x69, 0x6a, 0x86, 0xb5, 0x60, 0x8e, 0x69, + 0x2c, 0x57, 0x32, 0x9a, 0x9b, 0x92, 0x3b, 0xe5, 0x4c, 0xf2, 0x19, 0xec, 0x6b, 0xa6, 0xe9, 0x7c, + 0x27, 0xbb, 0xb9, 0x05, 0xfd, 0x1d, 0xd3, 0x6c, 0xbe, 0x6b, 0xe2, 0xd6, 0xda, 0xe5, 0xa3, 0xa2, + 0xb1, 0x1b, 0x86, 0x63, 0xe4, 0x00, 0xae, 0x48, 0xfc, 0x99, 0x61, 0xeb, 0x58, 0xb9, 0x58, 0x18, + 0x6e, 0x22, 0x02, 0x76, 0xc4, 0xd0, 0x2b, 0x31, 0x72, 0x8c, 0xb1, 0x77, 0x04, 0x84, 0xcf, 0x43, + 0xf5, 0x85, 0xef, 0x30, 0xc7, 0x74, 0xce, 0x0d, 0x1a, 0xf6, 0x16, 0xbc, 0x91, 0x99, 0x0b, 0xee, + 0x6a, 0x46, 0x4d, 0xba, 0xf4, 0x1d, 0x77, 0x4e, 0x5d, 0x4b, 0xdd, 0x91, 0x32, 0xf3, 0x48, 0xa4, + 0xfb, 0x73, 0xd8, 0xce, 0x2c, 0xfa, 0x83, 0x0a, 0x4c, 0x1f, 0x76, 0xf3, 0x34, 0x91, 0xdf, 0xc0, + 0x55, 0x4b, 0xf3, 0x97, 0x6f, 0x16, 0xa6, 0x76, 0x46, 0x4d, 0x74, 0x02, 0x96, 0xc0, 0x86, 0x63, + 0x87, 0x05, 0xd4, 0xed, 0x3c, 0x23, 0xc7, 0x08, 0xc6, 0x1a, 0xd2, 0x70, 0x29, 0x36, 0x70, 0xea, + 0x1e, 0x9f, 0x84, 0xb3, 0x87, 0xf1, 0x14, 0xca, 0x18, 0x6e, 0xbd, 0x4f, 0x34, 0x67, 0x15, 0xfb, + 0x50, 0xe1, 0x86, 0x8b, 0x57, 0x95, 0xba, 0x2a, 0x29, 0xe5, 0xaf, 0x05, 0xe8, 0xca, 0xd6, 0x42, + 0x6c, 0x4b, 0xfa, 0xf1, 0xea, 0x55, 0xe6, 0xf1, 0xea, 0x7e, 0xa2, 0xb7, 0xcf, 0xc1, 0xe7, 0xbe, + 0x64, 0xa9, 0xef, 0x7b, 0xc9, 0xfa, 0xff, 0xa4, 0x87, 0x5b, 0x87, 0x57, 0x2f, 0xd1, 0x91, 0x74, + 0xfd, 0xf7, 0x45, 0xa8, 0x47, 0x2f, 0x84, 0x89, 0xd2, 0xa1, 0x90, 0x2a, 0x1d, 0xda, 0x50, 0xc2, + 0x9c, 0x27, 0xea, 0x78, 0xfc, 0x44, 0xa4, 0x4c, 0x96, 0xa2, 0x74, 0x97, 0x14, 0x9f, 0x81, 0xfa, + 0xfd, 0xe9, 0x29, 0x8f, 0xeb, 0x9a, 0x2a, 0x29, 0x6c, 0xd3, 0x3d, 0x2a, 0x53, 0xa9, 0x8c, 0xe1, + 0x98, 0x81, 0xa1, 0xc1, 0xde, 0x68, 0x5e, 0x18, 0xaa, 0x82, 0x40, 0x19, 0xe7, 0x82, 0xba, 0xae, + 0xa1, 0xcb, 0xa8, 0xac, 0xab, 0x31, 0x23, 0x99, 0xc9, 0x6a, 0xa9, 0x4c, 0xa6, 0xcc, 0xa1, 0x22, + 0xd7, 0x53, 0x85, 0xd2, 0x64, 0x34, 0xce, 0x5e, 0x91, 0x00, 0x95, 0xfe, 0xf8, 0x64, 0xc6, 0xef, + 0xc7, 0xe4, 0xb5, 0x57, 0x42, 0x6a, 0x36, 0xef, 0xa9, 0xfc, 0xd2, 0xdb, 0x14, 0xd4, 0xc9, 0x74, + 0xca, 0x2f, 0x48, 0x65, 0x0e, 0xa4, 0xc7, 0xd8, 0x80, 0xfa, 0x74, 0x89, 0xb9, 0x4f, 0x37, 0x7c, + 0x3c, 0x72, 0x79, 0x45, 0xc8, 0x2e, 0x94, 0x5d, 0xaa, 0xe9, 0x2b, 0xee, 0xaf, 0x9a, 0x2a, 0x08, + 0xe4, 0x52, 0xd7, 0x75, 0x5c, 0x99, 0xe3, 0x05, 0xa1, 0xfc, 0xa3, 0x00, 0x80, 0xfe, 0x17, 0xbb, + 0x94, 0x9b, 0x9c, 0x3a, 0x50, 0xd5, 0x74, 0x1d, 0xc3, 0x36, 0xac, 0x86, 0x24, 0x49, 0xba, 0x50, + 0xf3, 0x97, 0x6c, 0xea, 0xb8, 0xbe, 0x48, 0x49, 0x65, 0x35, 0xa2, 0x71, 0x2c, 0xd0, 0xe5, 0xd8, + 0xa6, 0x18, 0x0b, 0x69, 0xac, 0x69, 0x12, 0x4f, 0x16, 0xbc, 0xa6, 0x89, 0x6d, 0xc0, 0x34, 0x2c, + 0x1f, 0x2b, 0x1e, 0xc6, 0xef, 0x8d, 0x95, 0x4b, 0xa1, 0x21, 0xa4, 0xfb, 0x18, 0x4a, 0x53, 0x47, + 0xcf, 0x5d, 0x42, 0x1c, 0x57, 0xc5, 0x64, 0x5c, 0x29, 0xcf, 0xa1, 0x11, 0xcf, 0x86, 0xd9, 0x3d, + 0x7e, 0x1c, 0x11, 0xc7, 0xa4, 0x95, 0x56, 0x18, 0x3f, 0x87, 0x28, 0xc7, 0xb0, 0xfd, 0x9a, 0x9a, + 0x16, 0x7f, 0xfe, 0x36, 0xa9, 0x86, 0x97, 0xc3, 0x0b, 0x68, 0xbd, 0x49, 0xb1, 0xe4, 0x24, 0xdc, + 0xea, 0x34, 0x58, 0xcd, 0x20, 0x95, 0xbf, 0x15, 0xa0, 0x95, 0x86, 0xa0, 0x07, 0x5d, 0x2a, 0x2e, + 0x00, 0xbe, 0x98, 0xb2, 0x1a, 0xd1, 0xb8, 0x27, 0x01, 0xd3, 0x35, 0xac, 0x46, 0xe4, 0x9e, 0x48, + 0x32, 0xb1, 0xd4, 0x52, 0xea, 0x08, 0xed, 0x42, 0x79, 0xf9, 0x46, 0x93, 0xa5, 0x7a, 0x5d, 0x15, + 0x04, 0xb9, 0x01, 0xa0, 0x31, 0xf6, 0x95, 0x8c, 0x63, 0x71, 0x7f, 0x27, 0x38, 0x78, 0x31, 0xe9, + 0xd4, 0x5b, 0xba, 0x06, 0xc3, 0x68, 0x93, 0xc7, 0x23, 0xc9, 0xba, 0xff, 0x29, 0x5c, 0xc9, 0x39, + 0xe2, 0xa4, 0x0e, 0x65, 0x51, 0x9d, 0x6d, 0x60, 0x75, 0x36, 0x39, 0x99, 0x2f, 0x04, 0x59, 0x38, + 0xfc, 0xa9, 0x0a, 0x2d, 0x5c, 0xa5, 0xf8, 0xb9, 0x30, 0x5b, 0xd9, 0x4b, 0xf2, 0x0a, 0xf6, 0x8f, + 0xa8, 0x1f, 0xa5, 0x81, 0x01, 0x65, 0x2e, 0x5d, 0xf2, 0xd5, 0x5c, 0x49, 0xa4, 0x90, 0xf0, 0xa5, + 0xbf, 0xbb, 0xb3, 0xf6, 0xf0, 0xae, 0x6c, 0x90, 0xc7, 0xb0, 0x95, 0x9c, 0x83, 0xb4, 0xc3, 0x9d, + 0x0b, 0xff, 0x3d, 0x74, 0x9b, 0x29, 0x8e, 0xb2, 0x41, 0x9e, 0x03, 0x08, 0x11, 0xfe, 0x5e, 0x4d, + 0x12, 0xaa, 0x42, 0x4d, 0xf9, 0xef, 0xbe, 0xca, 0x06, 0x19, 0xf0, 0x3e, 0x82, 0x3f, 0x40, 0x87, + 0xf2, 0xb9, 0xa6, 0x76, 0x2f, 0x7f, 0xa7, 0x56, 0x36, 0xc8, 0x13, 0x68, 0x1e, 0x51, 0x3f, 0xf1, + 0x98, 0x98, 0x67, 0x43, 0x2b, 0xfd, 0x62, 0xa5, 0x6c, 0x90, 0x97, 0xb0, 0x73, 0x44, 0xfd, 0xcc, + 0x8b, 0xc8, 0x4e, 0xb2, 0xcd, 0x16, 0x92, 0x39, 0x9d, 0x37, 0x5f, 0x35, 0x59, 0x93, 0xf6, 0x48, + 0x1d, 0xb1, 0xfc, 0xa7, 0x4e, 0x77, 0x3f, 0xff, 0x55, 0x40, 0xd9, 0x20, 0xaf, 0xe1, 0x2a, 0x7e, + 0xe5, 0x35, 0x6a, 0x79, 0x96, 0x5f, 0xcd, 0xef, 0xd7, 0xd0, 0xf5, 0x7d, 0xd8, 0xcb, 0x6d, 0xfa, + 0x09, 0x7f, 0xde, 0xbb, 0xf4, 0x3d, 0xa0, 0x1b, 0x9b, 0x29, 0x26, 0xc9, 0x6d, 0xda, 0xc5, 0x24, + 0x97, 0xf6, 0xf3, 0x6b, 0x93, 0xe4, 0x76, 0xdd, 0x44, 0x3e, 0x34, 0x9a, 0xff, 0xca, 0x24, 0x9f, + 0xf1, 0xe0, 0x8b, 0x8b, 0x6f, 0x1e, 0x0b, 0x99, 0x46, 0xb3, 0x1b, 0x96, 0xce, 0x82, 0xc3, 0xa5, + 0x70, 0x1f, 0x33, 0x15, 0x66, 0x62, 0x23, 0x48, 0xb6, 0xbe, 0xa3, 0xe8, 0xba, 0x5f, 0xf2, 0xfd, + 0xeb, 0x31, 0x96, 0x3a, 0x6f, 0x79, 0xfe, 0xbf, 0xf1, 0xee, 0x3b, 0x5e, 0xd9, 0x20, 0x8f, 0x60, + 0x1b, 0x37, 0x34, 0x99, 0x03, 0x41, 0x9e, 0x12, 0xb4, 0x78, 0x3b, 0x9d, 0xfd, 0x50, 0xfb, 0x53, + 0x20, 0x28, 0x91, 0x49, 0x55, 0x49, 0xa1, 0x2b, 0xeb, 0xd9, 0xce, 0x53, 0x36, 0xce, 0x2a, 0xfc, + 0xf7, 0xe1, 0xcf, 0xfe, 0x19, 0x00, 0x00, 0xff, 0xff, 0x26, 0xa2, 0xd2, 0x31, 0x5a, 0x1c, 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 2474a90f0..b29e1d77b 100644 --- a/worker/server/pb/app_runtime_server.proto +++ b/worker/server/pb/app_runtime_server.proto @@ -281,6 +281,7 @@ message AppService { repeated int32 tcpPorts=3; repeated int32 udpPorts=4; repeated Pod pods=5; + repeated Pod oldPods=6; } message AppServices { diff --git a/worker/server/server.go b/worker/server/server.go index 7cb6406ee..785d714d6 100644 --- a/worker/server/server.go +++ b/worker/server/server.go @@ -34,7 +34,6 @@ import ( "github.com/goodrain/rainbond/pkg/helm" "github.com/goodrain/rainbond/util" etcdutil "github.com/goodrain/rainbond/util/etcd" - "github.com/goodrain/rainbond/util/k8s" k8sutil "github.com/goodrain/rainbond/util/k8s" "github.com/goodrain/rainbond/worker/appm/store" "github.com/goodrain/rainbond/worker/appm/thirdparty/discovery" @@ -44,6 +43,7 @@ import ( "github.com/sirupsen/logrus" "google.golang.org/grpc" "google.golang.org/grpc/reflection" + appv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -527,7 +527,7 @@ func (r *RuntimeServer) UpdThirdPartyEndpoint(ctx context.Context, re *pb.UpdThi Port: int(re.Port), IsOnline: re.IsOnline, } - if re.IsOnline == false { + if !re.IsOnline { r.updateCh.In() <- discovery.Event{ Type: discovery.DeleteEvent, Obj: rbdep, @@ -690,7 +690,7 @@ func (r *RuntimeServer) convertServices(services []*corev1.Service) []*pb.AppSer selector = selector.Add(*req) } - var spods []*pb.AppService_Pod + var oldPods, newPods []*pb.AppService_Pod pods, err := r.store.ListPods(svc.Namespace, selector) if err != nil { logrus.Warningf("parse services: %v", err) @@ -698,10 +698,21 @@ func (r *RuntimeServer) convertServices(services []*corev1.Service) []*pb.AppSer for _, pod := range pods { podStatus := &pb.PodStatus{} wutil.DescribePodStatus(r.clientset, pod, podStatus, k8sutil.DefListEventsByPod) - spods = append(spods, &pb.AppService_Pod{ + po := &pb.AppService_Pod{ Name: pod.Name, Status: podStatus.TypeStr, - }) + } + + rss, err := r.store.ListReplicaSets(svc.Namespace, selector) + if err != nil { + logrus.Warningf("[RuntimeServer] convert services: list replica sets: %v", err) + } + + if isOldPod(pod, rss) { + oldPods = append(oldPods, po) + } else { + newPods = append(newPods, po) + } } } @@ -715,7 +726,8 @@ func (r *RuntimeServer) convertServices(services []*corev1.Service) []*pb.AppSer Address: address, TcpPorts: tcpPorts, UdpPorts: udpPorts, - Pods: spods, + OldPods: oldPods, + Pods: newPods, }) } return appServices @@ -755,3 +767,21 @@ func (r *RuntimeServer) ListHelmAppRelease(ctx context.Context, req *pb.AppReq) HelmAppRelease: releases, }, nil } + +func isOldPod(pod *corev1.Pod, rss []*appv1.ReplicaSet) bool { + if len(rss) == 0 { + return false + } + + var newrs *appv1.ReplicaSet + for _, rs := range rss { + if newrs == nil { + newrs = rs + continue + } + if newrs.ObjectMeta.CreationTimestamp.Before(&rs.ObjectMeta.CreationTimestamp) { + newrs = rs + } + } + return pod.ObjectMeta.CreationTimestamp.Before(&newrs.ObjectMeta.CreationTimestamp) +}