test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-03 04:07:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #346 from fanyangyang/M-GETTENANTS

Browse Source 
[ADD] add new fields for router GetTenants
This commit is contained in:
barnettZQG 2019-08-05 14:49:54 +08:00 committed by GitHub
commit aae8ff7735
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 188 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/handler/tenant.go
View File

@ -72,6 +72,8 @@ func (t *TenantAction) BindTenantsResource(source []*dbmodel.Tenants) api_model.
item.UnscdMemoryLimit = re.UnscdMemoryLimit item.UnscdMemoryLimit = re.UnscdMemoryLimit
item.UnscdMemoryReq = re.UnscdMemoryReq item.UnscdMemoryReq = re.UnscdMemoryReq
item.RunningAppNum = re.RunningAppNum item.RunningAppNum = re.RunningAppNum
item.RunningAppInternalNum = re.RunningAppInternalNum
item.RunningAppThirdNum = re.RunningAppThirdNum
} }
list.Add(item) list.Add(item)
} }

20
api/model/tenantResourceModel.go
View File

@ -70,15 +70,17 @@ func (list TenantResList) Swap(i, j int) {
//TenantAndResource tenant and resource strcut //TenantAndResource tenant and resource strcut
type TenantAndResource struct { type TenantAndResource struct {
dbmodel.Tenants dbmodel.Tenants
CPURequest int64 `json:"cpu_request"` CPURequest int64 `json:"cpu_request"`
CPULimit int64 `json:"cpu_limit"` CPULimit int64 `json:"cpu_limit"`
MemoryRequest int64 `json:"memory_request"` MemoryRequest int64 `json:"memory_request"`
MemoryLimit int64 `json:"memory_limit"` MemoryLimit int64 `json:"memory_limit"`
UnscdCPUReq int64 `json:"unscd_cpu_req"` UnscdCPUReq int64 `json:"unscd_cpu_req"`
UnscdCPULimit int64 `json:"unscd_cpu_limit"` UnscdCPULimit int64 `json:"unscd_cpu_limit"`
UnscdMemoryReq int64 `json:"unscd_memory_req"` UnscdMemoryReq int64 `json:"unscd_memory_req"`
UnscdMemoryLimit int64 `json:"unscd_memory_limit"` UnscdMemoryLimit int64 `json:"unscd_memory_limit"`
RunningAppNum int64 `json:"running_app_num"` RunningAppNum int64 `json:"running_app_num"`
RunningAppInternalNum int64 `json:"running_app_internal_num"`
RunningAppThirdNum int64 `json:"running_app_third_num"`
} }
//TenantList Tenant list struct //TenantList Tenant list struct

316
worker/server/pb/app_runtime_server.pb.go
View File

@ -3,12 +3,13 @@
package pb package pb
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
import math "math"
import ( import (
context "context" context "golang.org/x/net/context"
fmt "fmt"
proto "github.com/golang/protobuf/proto"
grpc "google.golang.org/grpc" grpc "google.golang.org/grpc"
math "math"
) )
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.
@ -32,17 +33,16 @@ func (m *Empty) Reset() { *m = Empty{} }
func (m *Empty) String() string { return proto.CompactTextString(m) } func (m *Empty) String() string { return proto.CompactTextString(m) }
func (*Empty) ProtoMessage() {} func (*Empty) ProtoMessage() {}
func (*Empty) Descriptor() ([]byte, []int) { func (*Empty) Descriptor() ([]byte, []int) {
return fileDescriptor_f94cf1a886c479d6, []int{0} return fileDescriptor_app_runtime_server_52464b0f7eb03240, []int{0}
} }
func (m *Empty) XXX_Unmarshal(b []byte) error { func (m *Empty) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_Empty.Unmarshal(m, b) return xxx_messageInfo_Empty.Unmarshal(m, b)
} }
func (m *Empty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { func (m *Empty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Empty.Marshal(b, m, deterministic) return xxx_messageInfo_Empty.Marshal(b, m, deterministic)
} }
func (m *Empty) XXX_Merge(src proto.Message) { func (dst *Empty) XXX_Merge(src proto.Message) {
xxx_messageInfo_Empty.Merge(m, src) xxx_messageInfo_Empty.Merge(dst, src)
} }
func (m *Empty) XXX_Size() int { func (m *Empty) XXX_Size() int {
return xxx_messageInfo_Empty.Size(m) return xxx_messageInfo_Empty.Size(m)
@ -64,17 +64,16 @@ func (m *ServiceRequest) Reset() { *m = ServiceRequest{} }
func (m *ServiceRequest) String() string { return proto.CompactTextString(m) } func (m *ServiceRequest) String() string { return proto.CompactTextString(m) }
func (*ServiceRequest) ProtoMessage() {} func (*ServiceRequest) ProtoMessage() {}
func (*ServiceRequest) Descriptor() ([]byte, []int) { func (*ServiceRequest) Descriptor() ([]byte, []int) {
return fileDescriptor_f94cf1a886c479d6, []int{1} return fileDescriptor_app_runtime_server_52464b0f7eb03240, []int{1}
} }
func (m *ServiceRequest) XXX_Unmarshal(b []byte) error { func (m *ServiceRequest) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ServiceRequest.Unmarshal(m, b) return xxx_messageInfo_ServiceRequest.Unmarshal(m, b)
} }
func (m *ServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { func (m *ServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ServiceRequest.Marshal(b, m, deterministic) return xxx_messageInfo_ServiceRequest.Marshal(b, m, deterministic)
} }
func (m *ServiceRequest) XXX_Merge(src proto.Message) { func (dst *ServiceRequest) XXX_Merge(src proto.Message) {
xxx_messageInfo_ServiceRequest.Merge(m, src) xxx_messageInfo_ServiceRequest.Merge(dst, src)
} }
func (m *ServiceRequest) XXX_Size() int { func (m *ServiceRequest) XXX_Size() int {
return xxx_messageInfo_ServiceRequest.Size(m) return xxx_messageInfo_ServiceRequest.Size(m)
@ -103,17 +102,16 @@ func (m *ServicesRequest) Reset() { *m = ServicesRequest{} }
func (m *ServicesRequest) String() string { return proto.CompactTextString(m) } func (m *ServicesRequest) String() string { return proto.CompactTextString(m) }
func (*ServicesRequest) ProtoMessage() {} func (*ServicesRequest) ProtoMessage() {}
func (*ServicesRequest) Descriptor() ([]byte, []int) { func (*ServicesRequest) Descriptor() ([]byte, []int) {
return fileDescriptor_f94cf1a886c479d6, []int{2} return fileDescriptor_app_runtime_server_52464b0f7eb03240, []int{2}
} }
func (m *ServicesRequest) XXX_Unmarshal(b []byte) error { func (m *ServicesRequest) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ServicesRequest.Unmarshal(m, b) return xxx_messageInfo_ServicesRequest.Unmarshal(m, b)
} }
func (m *ServicesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { func (m *ServicesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ServicesRequest.Marshal(b, m, deterministic) return xxx_messageInfo_ServicesRequest.Marshal(b, m, deterministic)
} }
func (m *ServicesRequest) XXX_Merge(src proto.Message) { func (dst *ServicesRequest) XXX_Merge(src proto.Message) {
xxx_messageInfo_ServicesRequest.Merge(m, src) xxx_messageInfo_ServicesRequest.Merge(dst, src)
} }
func (m *ServicesRequest) XXX_Size() int { func (m *ServicesRequest) XXX_Size() int {
return xxx_messageInfo_ServicesRequest.Size(m) return xxx_messageInfo_ServicesRequest.Size(m)
@ -142,17 +140,16 @@ func (m *TenantRequest) Reset() { *m = TenantRequest{} }
func (m *TenantRequest) String() string { return proto.CompactTextString(m) } func (m *TenantRequest) String() string { return proto.CompactTextString(m) }
func (*TenantRequest) ProtoMessage() {} func (*TenantRequest) ProtoMessage() {}
func (*TenantRequest) Descriptor() ([]byte, []int) { func (*TenantRequest) Descriptor() ([]byte, []int) {
return fileDescriptor_f94cf1a886c479d6, []int{3} return fileDescriptor_app_runtime_server_52464b0f7eb03240, []int{3}
} }
func (m *TenantRequest) XXX_Unmarshal(b []byte) error { func (m *TenantRequest) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_TenantRequest.Unmarshal(m, b) return xxx_messageInfo_TenantRequest.Unmarshal(m, b)
} }
func (m *TenantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { func (m *TenantRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_TenantRequest.Marshal(b, m, deterministic) return xxx_messageInfo_TenantRequest.Marshal(b, m, deterministic)
} }
func (m *TenantRequest) XXX_Merge(src proto.Message) { func (dst *TenantRequest) XXX_Merge(src proto.Message) {
xxx_messageInfo_TenantRequest.Merge(m, src) xxx_messageInfo_TenantRequest.Merge(dst, src)
} }
func (m *TenantRequest) XXX_Size() int { func (m *TenantRequest) XXX_Size() int {
return xxx_messageInfo_TenantRequest.Size(m) return xxx_messageInfo_TenantRequest.Size(m)
@ -181,17 +178,16 @@ func (m *StatusMessage) Reset() { *m = StatusMessage{} }
func (m *StatusMessage) String() string { return proto.CompactTextString(m) } func (m *StatusMessage) String() string { return proto.CompactTextString(m) }
func (*StatusMessage) ProtoMessage() {} func (*StatusMessage) ProtoMessage() {}
func (*StatusMessage) Descriptor() ([]byte, []int) { func (*StatusMessage) Descriptor() ([]byte, []int) {
return fileDescriptor_f94cf1a886c479d6, []int{4} return fileDescriptor_app_runtime_server_52464b0f7eb03240, []int{4}
} }
func (m *StatusMessage) XXX_Unmarshal(b []byte) error { func (m *StatusMessage) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_StatusMessage.Unmarshal(m, b) return xxx_messageInfo_StatusMessage.Unmarshal(m, b)
} }
func (m *StatusMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { func (m *StatusMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_StatusMessage.Marshal(b, m, deterministic) return xxx_messageInfo_StatusMessage.Marshal(b, m, deterministic)
} }
func (m *StatusMessage) XXX_Merge(src proto.Message) { func (dst *StatusMessage) XXX_Merge(src proto.Message) {
xxx_messageInfo_StatusMessage.Merge(m, src) xxx_messageInfo_StatusMessage.Merge(dst, src)
} }
func (m *StatusMessage) XXX_Size() int { func (m *StatusMessage) XXX_Size() int {
return xxx_messageInfo_StatusMessage.Size(m) return xxx_messageInfo_StatusMessage.Size(m)
@ -220,17 +216,16 @@ func (m *DiskMessage) Reset() { *m = DiskMessage{} }
func (m *DiskMessage) String() string { return proto.CompactTextString(m) } func (m *DiskMessage) String() string { return proto.CompactTextString(m) }
func (*DiskMessage) ProtoMessage() {} func (*DiskMessage) ProtoMessage() {}
func (*DiskMessage) Descriptor() ([]byte, []int) { func (*DiskMessage) Descriptor() ([]byte, []int) {
return fileDescriptor_f94cf1a886c479d6, []int{5} return fileDescriptor_app_runtime_server_52464b0f7eb03240, []int{5}
} }
func (m *DiskMessage) XXX_Unmarshal(b []byte) error { func (m *DiskMessage) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DiskMessage.Unmarshal(m, b) return xxx_messageInfo_DiskMessage.Unmarshal(m, b)
} }
func (m *DiskMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { func (m *DiskMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_DiskMessage.Marshal(b, m, deterministic) return xxx_messageInfo_DiskMessage.Marshal(b, m, deterministic)
} }
func (m *DiskMessage) XXX_Merge(src proto.Message) { func (dst *DiskMessage) XXX_Merge(src proto.Message) {
xxx_messageInfo_DiskMessage.Merge(m, src) xxx_messageInfo_DiskMessage.Merge(dst, src)
} }
func (m *DiskMessage) XXX_Size() int { func (m *DiskMessage) XXX_Size() int {
return xxx_messageInfo_DiskMessage.Size(m) return xxx_messageInfo_DiskMessage.Size(m)
@ -259,17 +254,16 @@ func (m *ServiceAppPodList) Reset() { *m = ServiceAppPodList{} }
func (m *ServiceAppPodList) String() string { return proto.CompactTextString(m) } func (m *ServiceAppPodList) String() string { return proto.CompactTextString(m) }
func (*ServiceAppPodList) ProtoMessage() {} func (*ServiceAppPodList) ProtoMessage() {}
func (*ServiceAppPodList) Descriptor() ([]byte, []int) { func (*ServiceAppPodList) Descriptor() ([]byte, []int) {
return fileDescriptor_f94cf1a886c479d6, []int{6} return fileDescriptor_app_runtime_server_52464b0f7eb03240, []int{6}
} }
func (m *ServiceAppPodList) XXX_Unmarshal(b []byte) error { func (m *ServiceAppPodList) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ServiceAppPodList.Unmarshal(m, b) return xxx_messageInfo_ServiceAppPodList.Unmarshal(m, b)
} }
func (m *ServiceAppPodList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { func (m *ServiceAppPodList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ServiceAppPodList.Marshal(b, m, deterministic) return xxx_messageInfo_ServiceAppPodList.Marshal(b, m, deterministic)
} }
func (m *ServiceAppPodList) XXX_Merge(src proto.Message) { func (dst *ServiceAppPodList) XXX_Merge(src proto.Message) {
xxx_messageInfo_ServiceAppPodList.Merge(m, src) xxx_messageInfo_ServiceAppPodList.Merge(dst, src)
} }
func (m *ServiceAppPodList) XXX_Size() int { func (m *ServiceAppPodList) XXX_Size() int {
return xxx_messageInfo_ServiceAppPodList.Size(m) return xxx_messageInfo_ServiceAppPodList.Size(m)
@ -304,17 +298,16 @@ func (m *ServiceAppPod) Reset() { *m = ServiceAppPod{} }
func (m *ServiceAppPod) String() string { return proto.CompactTextString(m) } func (m *ServiceAppPod) String() string { return proto.CompactTextString(m) }
func (*ServiceAppPod) ProtoMessage() {} func (*ServiceAppPod) ProtoMessage() {}
func (*ServiceAppPod) Descriptor() ([]byte, []int) { func (*ServiceAppPod) Descriptor() ([]byte, []int) {
return fileDescriptor_f94cf1a886c479d6, []int{7} return fileDescriptor_app_runtime_server_52464b0f7eb03240, []int{7}
} }
func (m *ServiceAppPod) XXX_Unmarshal(b []byte) error { func (m *ServiceAppPod) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ServiceAppPod.Unmarshal(m, b) return xxx_messageInfo_ServiceAppPod.Unmarshal(m, b)
} }
func (m *ServiceAppPod) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { func (m *ServiceAppPod) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ServiceAppPod.Marshal(b, m, deterministic) return xxx_messageInfo_ServiceAppPod.Marshal(b, m, deterministic)
} }
func (m *ServiceAppPod) XXX_Merge(src proto.Message) { func (dst *ServiceAppPod) XXX_Merge(src proto.Message) {
xxx_messageInfo_ServiceAppPod.Merge(m, src) xxx_messageInfo_ServiceAppPod.Merge(dst, src)
} }
func (m *ServiceAppPod) XXX_Size() int { func (m *ServiceAppPod) XXX_Size() int {
return xxx_messageInfo_ServiceAppPod.Size(m) return xxx_messageInfo_ServiceAppPod.Size(m)
@ -386,17 +379,16 @@ func (m *Container) Reset() { *m = Container{} }
func (m *Container) String() string { return proto.CompactTextString(m) } func (m *Container) String() string { return proto.CompactTextString(m) }
func (*Container) ProtoMessage() {} func (*Container) ProtoMessage() {}
func (*Container) Descriptor() ([]byte, []int) { func (*Container) Descriptor() ([]byte, []int) {
return fileDescriptor_f94cf1a886c479d6, []int{8} return fileDescriptor_app_runtime_server_52464b0f7eb03240, []int{8}
} }
func (m *Container) XXX_Unmarshal(b []byte) error { func (m *Container) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_Container.Unmarshal(m, b) return xxx_messageInfo_Container.Unmarshal(m, b)
} }
func (m *Container) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { func (m *Container) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Container.Marshal(b, m, deterministic) return xxx_messageInfo_Container.Marshal(b, m, deterministic)
} }
func (m *Container) XXX_Merge(src proto.Message) { func (dst *Container) XXX_Merge(src proto.Message) {
xxx_messageInfo_Container.Merge(m, src) xxx_messageInfo_Container.Merge(dst, src)
} }
func (m *Container) XXX_Size() int { func (m *Container) XXX_Size() int {
return xxx_messageInfo_Container.Size(m) return xxx_messageInfo_Container.Size(m)
@ -441,17 +433,16 @@ func (m *DeployInfo) Reset() { *m = DeployInfo{} }
func (m *DeployInfo) String() string { return proto.CompactTextString(m) } func (m *DeployInfo) String() string { return proto.CompactTextString(m) }
func (*DeployInfo) ProtoMessage() {} func (*DeployInfo) ProtoMessage() {}
func (*DeployInfo) Descriptor() ([]byte, []int) { func (*DeployInfo) Descriptor() ([]byte, []int) {
return fileDescriptor_f94cf1a886c479d6, []int{9} return fileDescriptor_app_runtime_server_52464b0f7eb03240, []int{9}
} }
func (m *DeployInfo) XXX_Unmarshal(b []byte) error { func (m *DeployInfo) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DeployInfo.Unmarshal(m, b) return xxx_messageInfo_DeployInfo.Unmarshal(m, b)
} }
func (m *DeployInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { func (m *DeployInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_DeployInfo.Marshal(b, m, deterministic) return xxx_messageInfo_DeployInfo.Marshal(b, m, deterministic)
} }
func (m *DeployInfo) XXX_Merge(src proto.Message) { func (dst *DeployInfo) XXX_Merge(src proto.Message) {
xxx_messageInfo_DeployInfo.Merge(m, src) xxx_messageInfo_DeployInfo.Merge(dst, src)
} }
func (m *DeployInfo) XXX_Size() int { func (m *DeployInfo) XXX_Size() int {
return xxx_messageInfo_DeployInfo.Size(m) return xxx_messageInfo_DeployInfo.Size(m)
@ -533,35 +524,36 @@ func (m *DeployInfo) GetStatus() string {
} }
type TenantResource struct { type TenantResource struct {
CpuRequest int64 `protobuf:"varint,1,opt,name=cpu_request,json=cpuRequest,proto3" json:"cpu_request,omitempty"` CpuRequest int64 `protobuf:"varint,1,opt,name=cpu_request,json=cpuRequest,proto3" json:"cpu_request,omitempty"`
CpuLimit int64 `protobuf:"varint,2,opt,name=cpu_limit,json=cpuLimit,proto3" json:"cpu_limit,omitempty"` CpuLimit int64 `protobuf:"varint,2,opt,name=cpu_limit,json=cpuLimit,proto3" json:"cpu_limit,omitempty"`
MemoryRequest int64 `protobuf:"varint,3,opt,name=memory_request,json=memoryRequest,proto3" json:"memory_request,omitempty"` MemoryRequest int64 `protobuf:"varint,3,opt,name=memory_request,json=memoryRequest,proto3" json:"memory_request,omitempty"`
MemoryLimit int64 `protobuf:"varint,4,opt,name=memory_limit,json=memoryLimit,proto3" json:"memory_limit,omitempty"` MemoryLimit int64 `protobuf:"varint,4,opt,name=memory_limit,json=memoryLimit,proto3" json:"memory_limit,omitempty"`
RunningAppNum int64 `protobuf:"varint,5,opt,name=running_app_num,json=runningAppNum,proto3" json:"running_app_num,omitempty"` RunningAppNum int64 `protobuf:"varint,5,opt,name=running_app_num,json=runningAppNum,proto3" json:"running_app_num,omitempty"`
UnscdCpuReq int64 `protobuf:"varint,6,opt,name=unscd_cpu_req,json=unscdCpuReq,proto3" json:"unscd_cpu_req,omitempty"` UnscdCpuReq int64 `protobuf:"varint,6,opt,name=unscd_cpu_req,json=unscdCpuReq,proto3" json:"unscd_cpu_req,omitempty"`
UnscdCpuLimit int64 `protobuf:"varint,7,opt,name=unscd_cpu_limit,json=unscdCpuLimit,proto3" json:"unscd_cpu_limit,omitempty"` UnscdCpuLimit int64 `protobuf:"varint,7,opt,name=unscd_cpu_limit,json=unscdCpuLimit,proto3" json:"unscd_cpu_limit,omitempty"`
UnscdMemoryReq int64 `protobuf:"varint,8,opt,name=unscd_memory_req,json=unscdMemoryReq,proto3" json:"unscd_memory_req,omitempty"` UnscdMemoryReq int64 `protobuf:"varint,8,opt,name=unscd_memory_req,json=unscdMemoryReq,proto3" json:"unscd_memory_req,omitempty"`
UnscdMemoryLimit int64 `protobuf:"varint,9,opt,name=unscd_memory_limit,json=unscdMemoryLimit,proto3" json:"unscd_memory_limit,omitempty"` UnscdMemoryLimit int64 `protobuf:"varint,9,opt,name=unscd_memory_limit,json=unscdMemoryLimit,proto3" json:"unscd_memory_limit,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` RunningAppThirdNum int64 `protobuf:"varint,10,opt,name=running_app_third_num,json=runningAppThirdNum,proto3" json:"running_app_third_num,omitempty"`
XXX_unrecognized []byte `json:"-"` RunningAppInternalNum int64 `protobuf:"varint,11,opt,name=running_app_internal_num,json=runningAppInternalNum,proto3" json:"running_app_internal_num,omitempty"`
XXX_sizecache int32 `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
} }
func (m *TenantResource) Reset() { *m = TenantResource{} } func (m *TenantResource) Reset() { *m = TenantResource{} }
func (m *TenantResource) String() string { return proto.CompactTextString(m) } func (m *TenantResource) String() string { return proto.CompactTextString(m) }
func (*TenantResource) ProtoMessage() {} func (*TenantResource) ProtoMessage() {}
func (*TenantResource) Descriptor() ([]byte, []int) { func (*TenantResource) Descriptor() ([]byte, []int) {
return fileDescriptor_f94cf1a886c479d6, []int{10} return fileDescriptor_app_runtime_server_52464b0f7eb03240, []int{10}
} }
func (m *TenantResource) XXX_Unmarshal(b []byte) error { func (m *TenantResource) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_TenantResource.Unmarshal(m, b) return xxx_messageInfo_TenantResource.Unmarshal(m, b)
} }
func (m *TenantResource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { func (m *TenantResource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_TenantResource.Marshal(b, m, deterministic) return xxx_messageInfo_TenantResource.Marshal(b, m, deterministic)
} }
func (m *TenantResource) XXX_Merge(src proto.Message) { func (dst *TenantResource) XXX_Merge(src proto.Message) {
xxx_messageInfo_TenantResource.Merge(m, src) xxx_messageInfo_TenantResource.Merge(dst, src)
} }
func (m *TenantResource) XXX_Size() int { func (m *TenantResource) XXX_Size() int {
return xxx_messageInfo_TenantResource.Size(m) return xxx_messageInfo_TenantResource.Size(m)
@ -635,6 +627,20 @@ func (m *TenantResource) GetUnscdMemoryLimit() int64 {
return 0 return 0
} }
func (m *TenantResource) GetRunningAppThirdNum() int64 {
if m != nil {
return m.RunningAppThirdNum
}
return 0
}
func (m *TenantResource) GetRunningAppInternalNum() int64 {
if m != nil {
return m.RunningAppInternalNum
}
return 0
}
type AddThirdPartyEndpointsReq struct { type AddThirdPartyEndpointsReq struct {
Uuid string `protobuf:"bytes,1,opt,name=uuid,proto3" json:"uuid,omitempty"` Uuid string `protobuf:"bytes,1,opt,name=uuid,proto3" json:"uuid,omitempty"`
Sid string `protobuf:"bytes,2,opt,name=sid,proto3" json:"sid,omitempty"` Sid string `protobuf:"bytes,2,opt,name=sid,proto3" json:"sid,omitempty"`
@ -650,17 +656,16 @@ func (m *AddThirdPartyEndpointsReq) Reset() { *m = AddThirdPartyEndpoint
func (m *AddThirdPartyEndpointsReq) String() string { return proto.CompactTextString(m) } func (m *AddThirdPartyEndpointsReq) String() string { return proto.CompactTextString(m) }
func (*AddThirdPartyEndpointsReq) ProtoMessage() {} func (*AddThirdPartyEndpointsReq) ProtoMessage() {}
func (*AddThirdPartyEndpointsReq) Descriptor() ([]byte, []int) { func (*AddThirdPartyEndpointsReq) Descriptor() ([]byte, []int) {
return fileDescriptor_f94cf1a886c479d6, []int{11} return fileDescriptor_app_runtime_server_52464b0f7eb03240, []int{11}
} }
func (m *AddThirdPartyEndpointsReq) XXX_Unmarshal(b []byte) error { func (m *AddThirdPartyEndpointsReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_AddThirdPartyEndpointsReq.Unmarshal(m, b) return xxx_messageInfo_AddThirdPartyEndpointsReq.Unmarshal(m, b)
} }
func (m *AddThirdPartyEndpointsReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { func (m *AddThirdPartyEndpointsReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_AddThirdPartyEndpointsReq.Marshal(b, m, deterministic) return xxx_messageInfo_AddThirdPartyEndpointsReq.Marshal(b, m, deterministic)
} }
func (m *AddThirdPartyEndpointsReq) XXX_Merge(src proto.Message) { func (dst *AddThirdPartyEndpointsReq) XXX_Merge(src proto.Message) {
xxx_messageInfo_AddThirdPartyEndpointsReq.Merge(m, src) xxx_messageInfo_AddThirdPartyEndpointsReq.Merge(dst, src)
} }
func (m *AddThirdPartyEndpointsReq) XXX_Size() int { func (m *AddThirdPartyEndpointsReq) XXX_Size() int {
return xxx_messageInfo_AddThirdPartyEndpointsReq.Size(m) return xxx_messageInfo_AddThirdPartyEndpointsReq.Size(m)
@ -721,17 +726,16 @@ func (m *UpdThirdPartyEndpointsReq) Reset() { *m = UpdThirdPartyEndpoint
func (m *UpdThirdPartyEndpointsReq) String() string { return proto.CompactTextString(m) } func (m *UpdThirdPartyEndpointsReq) String() string { return proto.CompactTextString(m) }
func (*UpdThirdPartyEndpointsReq) ProtoMessage() {} func (*UpdThirdPartyEndpointsReq) ProtoMessage() {}
func (*UpdThirdPartyEndpointsReq) Descriptor() ([]byte, []int) { func (*UpdThirdPartyEndpointsReq) Descriptor() ([]byte, []int) {
return fileDescriptor_f94cf1a886c479d6, []int{12} return fileDescriptor_app_runtime_server_52464b0f7eb03240, []int{12}
} }
func (m *UpdThirdPartyEndpointsReq) XXX_Unmarshal(b []byte) error { func (m *UpdThirdPartyEndpointsReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_UpdThirdPartyEndpointsReq.Unmarshal(m, b) return xxx_messageInfo_UpdThirdPartyEndpointsReq.Unmarshal(m, b)
} }
func (m *UpdThirdPartyEndpointsReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { func (m *UpdThirdPartyEndpointsReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_UpdThirdPartyEndpointsReq.Marshal(b, m, deterministic) return xxx_messageInfo_UpdThirdPartyEndpointsReq.Marshal(b, m, deterministic)
} }
func (m *UpdThirdPartyEndpointsReq) XXX_Merge(src proto.Message) { func (dst *UpdThirdPartyEndpointsReq) XXX_Merge(src proto.Message) {
xxx_messageInfo_UpdThirdPartyEndpointsReq.Merge(m, src) xxx_messageInfo_UpdThirdPartyEndpointsReq.Merge(dst, src)
} }
func (m *UpdThirdPartyEndpointsReq) XXX_Size() int { func (m *UpdThirdPartyEndpointsReq) XXX_Size() int {
return xxx_messageInfo_UpdThirdPartyEndpointsReq.Size(m) return xxx_messageInfo_UpdThirdPartyEndpointsReq.Size(m)
@ -789,17 +793,16 @@ func (m *DelThirdPartyEndpointsReq) Reset() { *m = DelThirdPartyEndpoint
func (m *DelThirdPartyEndpointsReq) String() string { return proto.CompactTextString(m) } func (m *DelThirdPartyEndpointsReq) String() string { return proto.CompactTextString(m) }
func (*DelThirdPartyEndpointsReq) ProtoMessage() {} func (*DelThirdPartyEndpointsReq) ProtoMessage() {}
func (*DelThirdPartyEndpointsReq) Descriptor() ([]byte, []int) { func (*DelThirdPartyEndpointsReq) Descriptor() ([]byte, []int) {
return fileDescriptor_f94cf1a886c479d6, []int{13} return fileDescriptor_app_runtime_server_52464b0f7eb03240, []int{13}
} }
func (m *DelThirdPartyEndpointsReq) XXX_Unmarshal(b []byte) error { func (m *DelThirdPartyEndpointsReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DelThirdPartyEndpointsReq.Unmarshal(m, b) return xxx_messageInfo_DelThirdPartyEndpointsReq.Unmarshal(m, b)
} }
func (m *DelThirdPartyEndpointsReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { func (m *DelThirdPartyEndpointsReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_DelThirdPartyEndpointsReq.Marshal(b, m, deterministic) return xxx_messageInfo_DelThirdPartyEndpointsReq.Marshal(b, m, deterministic)
} }
func (m *DelThirdPartyEndpointsReq) XXX_Merge(src proto.Message) { func (dst *DelThirdPartyEndpointsReq) XXX_Merge(src proto.Message) {
xxx_messageInfo_DelThirdPartyEndpointsReq.Merge(m, src) xxx_messageInfo_DelThirdPartyEndpointsReq.Merge(dst, src)
} }
func (m *DelThirdPartyEndpointsReq) XXX_Size() int { func (m *DelThirdPartyEndpointsReq) XXX_Size() int {
return xxx_messageInfo_DelThirdPartyEndpointsReq.Size(m) return xxx_messageInfo_DelThirdPartyEndpointsReq.Size(m)
@ -840,17 +843,16 @@ func (m *ThirdPartyEndpoint) Reset() { *m = ThirdPartyEndpoint{} }
func (m *ThirdPartyEndpoint) String() string { return proto.CompactTextString(m) } func (m *ThirdPartyEndpoint) String() string { return proto.CompactTextString(m) }
func (*ThirdPartyEndpoint) ProtoMessage() {} func (*ThirdPartyEndpoint) ProtoMessage() {}
func (*ThirdPartyEndpoint) Descriptor() ([]byte, []int) { func (*ThirdPartyEndpoint) Descriptor() ([]byte, []int) {
return fileDescriptor_f94cf1a886c479d6, []int{14} return fileDescriptor_app_runtime_server_52464b0f7eb03240, []int{14}
} }
func (m *ThirdPartyEndpoint) XXX_Unmarshal(b []byte) error { func (m *ThirdPartyEndpoint) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ThirdPartyEndpoint.Unmarshal(m, b) return xxx_messageInfo_ThirdPartyEndpoint.Unmarshal(m, b)
} }
func (m *ThirdPartyEndpoint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { func (m *ThirdPartyEndpoint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ThirdPartyEndpoint.Marshal(b, m, deterministic) return xxx_messageInfo_ThirdPartyEndpoint.Marshal(b, m, deterministic)
} }
func (m *ThirdPartyEndpoint) XXX_Merge(src proto.Message) { func (dst *ThirdPartyEndpoint) XXX_Merge(src proto.Message) {
xxx_messageInfo_ThirdPartyEndpoint.Merge(m, src) xxx_messageInfo_ThirdPartyEndpoint.Merge(dst, src)
} }
func (m *ThirdPartyEndpoint) XXX_Size() int { func (m *ThirdPartyEndpoint) XXX_Size() int {
return xxx_messageInfo_ThirdPartyEndpoint.Size(m) return xxx_messageInfo_ThirdPartyEndpoint.Size(m)
@ -914,17 +916,16 @@ func (m *ThirdPartyEndpoints) Reset() { *m = ThirdPartyEndpoints{} }
func (m *ThirdPartyEndpoints) String() string { return proto.CompactTextString(m) } func (m *ThirdPartyEndpoints) String() string { return proto.CompactTextString(m) }
func (*ThirdPartyEndpoints) ProtoMessage() {} func (*ThirdPartyEndpoints) ProtoMessage() {}
func (*ThirdPartyEndpoints) Descriptor() ([]byte, []int) { func (*ThirdPartyEndpoints) Descriptor() ([]byte, []int) {
return fileDescriptor_f94cf1a886c479d6, []int{15} return fileDescriptor_app_runtime_server_52464b0f7eb03240, []int{15}
} }
func (m *ThirdPartyEndpoints) XXX_Unmarshal(b []byte) error { func (m *ThirdPartyEndpoints) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ThirdPartyEndpoints.Unmarshal(m, b) return xxx_messageInfo_ThirdPartyEndpoints.Unmarshal(m, b)
} }
func (m *ThirdPartyEndpoints) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { func (m *ThirdPartyEndpoints) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ThirdPartyEndpoints.Marshal(b, m, deterministic) return xxx_messageInfo_ThirdPartyEndpoints.Marshal(b, m, deterministic)
} }
func (m *ThirdPartyEndpoints) XXX_Merge(src proto.Message) { func (dst *ThirdPartyEndpoints) XXX_Merge(src proto.Message) {
xxx_messageInfo_ThirdPartyEndpoints.Merge(m, src) xxx_messageInfo_ThirdPartyEndpoints.Merge(dst, src)
} }
func (m *ThirdPartyEndpoints) XXX_Size() int { func (m *ThirdPartyEndpoints) XXX_Size() int {
return xxx_messageInfo_ThirdPartyEndpoints.Size(m) return xxx_messageInfo_ThirdPartyEndpoints.Size(m)
@ -970,81 +971,6 @@ func init() {
proto.RegisterType((*ThirdPartyEndpoints)(nil), "pb.ThirdPartyEndpoints") proto.RegisterType((*ThirdPartyEndpoints)(nil), "pb.ThirdPartyEndpoints")
} }
func init() { proto.RegisterFile("app_runtime_server.proto", fileDescriptor_f94cf1a886c479d6) }
var fileDescriptor_f94cf1a886c479d6 = []byte{
// 1103 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0x6d, 0x6f, 0xdb, 0x36,
0x10, 0xf6, 0xbb, 0xad, 0x73, 0xec, 0x26, 0xec, 0xd2, 0x2a, 0x6e, 0xbb, 0xb6, 0x1a, 0x3a, 0xe4,
0x43, 0xe0, 0x0d, 0x19, 0x82, 0xa5, 0x69, 0xb1, 0xc1, 0x48, 0x82, 0xcc, 0x40, 0xda, 0x05, 0x4a,
0xfa, 0xd9, 0x50, 0x24, 0x36, 0xe3, 0x62, 0x51, 0x9c, 0x48, 0x05, 0xd0, 0xc7, 0xed, 0x2f, 0xf4,
0x7f, 0x0d, 0xfb, 0x11, 0xfb, 0x21, 0x03, 0x5f, 0x24, 0x4b, 0xb6, 0x8a, 0xce, 0xdb, 0x80, 0x7d,
0x93, 0x1f, 0x3e, 0xcf, 0x1d, 0x79, 0xc7, 0xbb, 0xa3, 0xc1, 0xf6, 0x18, 0x9b, 0xc5, 0x09, 0x15,
0x24, 0xc4, 0x33, 0x8e, 0xe3, 0x3b, 0x1c, 0x8f, 0x59, 0x1c, 0x89, 0x08, 0x35, 0xd8, 0xb5, 0xd3,
0x85, 0xf6, 0x69, 0xc8, 0x44, 0xea, 0x7c, 0x05, 0xc3, 0x4b, 0x1c, 0xdf, 0x11, 0x1f, 0xbb, 0xf8,
0x97, 0x04, 0x73, 0x81, 0x9e, 0x00, 0x70, 0x8d, 0xcc, 0x48, 0x60, 0xd7, 0x9f, 0xd5, 0x77, 0x2d,
0xd7, 0x32, 0xc8, 0x34, 0x70, 0xf6, 0xe1, 0x9e, 0x11, 0xf0, 0x4c, 0xf1, 0x14, 0xfa, 0x0b, 0x05,
0x37, 0x12, 0xc8, 0x25, 0xdc, 0xd9, 0x83, 0xc1, 0x15, 0xa6, 0x1e, 0x15, 0x99, 0xe2, 0x11, 0x58,
0x42, 0x01, 0x0b, 0x17, 0x3d, 0x0d, 0x4c, 0x03, 0xe7, 0xd7, 0x3a, 0x0c, 0x2e, 0x85, 0x27, 0x12,
0xfe, 0x06, 0x73, 0xee, 0xdd, 0x60, 0x74, 0x00, 0x1d, 0xae, 0x00, 0xbb, 0xfe, 0xac, 0xb9, 0xdb,
0xdf, 0x7f, 0x32, 0x66, 0xd7, 0xe3, 0x12, 0xc5, 0xfc, 0x3a, 0xa5, 0x22, 0x4e, 0x5d, 0x43, 0x1e,
0xbd, 0x84, 0x7e, 0x01, 0x46, 0x9b, 0xd0, 0xbc, 0xc5, 0xa9, 0x71, 0x27, 0x3f, 0xd1, 0x67, 0xd0,
0xbe, 0xf3, 0xe6, 0x09, 0xb6, 0x1b, 0x0a, 0xd3, 0x3f, 0x8e, 0x1a, 0x87, 0x75, 0x27, 0x85, 0xfe,
0x09, 0xe1, 0xb7, 0xd9, 0x06, 0xbe, 0x86, 0x76, 0x40, 0xf8, 0x6d, 0xe6, 0x7f, 0x24, 0xfd, 0x17,
0xd6, 0xd5, 0xb7, 0x71, 0xae, 0x89, 0xa3, 0x43, 0x80, 0x05, 0xf8, 0x29, 0xd7, 0xf5, 0xa2, 0xeb,
0x23, 0xd8, 0x32, 0x01, 0x9e, 0x30, 0x76, 0x11, 0x05, 0xe7, 0x84, 0x0b, 0xf4, 0x02, 0x5a, 0x2c,
0x0a, 0x32, 0xff, 0x5b, 0xea, 0xfc, 0x45, 0x92, 0xab, 0x96, 0x9d, 0xdf, 0x1b, 0x30, 0x28, 0xe1,
0x9f, 0xc8, 0xa6, 0x4c, 0x44, 0x80, 0xd9, 0x3c, 0x4a, 0xe5, 0xaa, 0x8e, 0x42, 0x4f, 0x03, 0xd3,
0x40, 0xe6, 0xd5, 0x2c, 0x8a, 0x94, 0x61, 0xbb, 0xa9, 0xf3, 0xaa, 0xa1, 0xab, 0x94, 0x61, 0xb4,
0x03, 0x3d, 0x16, 0x05, 0x33, 0xea, 0x85, 0xd8, 0x6e, 0xa9, 0xd5, 0x2e, 0x8b, 0x82, 0xb7, 0x5e,
0x88, 0xd1, 0x36, 0x74, 0xe4, 0x12, 0x61, 0x76, 0x5b, 0xc7, 0x96, 0x45, 0xc1, 0x94, 0xc9, 0xed,
0x48, 0xd8, 0x64, 0xb3, 0xa3, 0xb7, 0xc3, 0xa2, 0x40, 0xe7, 0x09, 0x4d, 0x00, 0xfc, 0x88, 0x0a,
0x8f, 0x50, 0x1c, 0x73, 0xbb, 0xab, 0x0e, 0xfb, 0x7c, 0xe5, 0xb0, 0xe3, 0xe3, 0x9c, 0xa3, 0x63,
0x5e, 0x10, 0x8d, 0xce, 0xe1, 0xde, 0xd2, 0x72, 0x45, 0xf4, 0xbf, 0x28, 0x46, 0xbf, 0xbf, 0x3f,
0x90, 0x2e, 0x72, 0x55, 0x31, 0x19, 0xef, 0xc0, 0xca, 0x71, 0xf4, 0x02, 0x86, 0xb9, 0x23, 0x7d,
0x68, 0x6d, 0x72, 0x90, 0xa3, 0xea, 0xe8, 0xcf, 0x61, 0x23, 0xc4, 0x61, 0x14, 0xa7, 0xb3, 0x39,
0x09, 0x89, 0x50, 0x3e, 0x9a, 0x6e, 0x5f, 0x63, 0xe7, 0x12, 0x72, 0xfe, 0xe8, 0x00, 0x9c, 0xe8,
0x30, 0xd3, 0xf7, 0x11, 0x7a, 0x0c, 0x96, 0x34, 0xc7, 0x99, 0xe7, 0x67, 0x36, 0x17, 0x00, 0x72,
0x60, 0x43, 0xc6, 0x0b, 0xbf, 0x4f, 0xe6, 0x98, 0x63, 0x61, 0xd2, 0x54, 0xc2, 0xd0, 0xe7, 0x60,
0xf2, 0x12, 0x62, 0x2a, 0xca, 0x99, 0x92, 0x08, 0xda, 0x33, 0xf7, 0xa7, 0xa5, 0x42, 0x6a, 0xab,
0xfb, 0x9b, 0xfb, 0x1f, 0x5f, 0x44, 0x81, 0x89, 0xa4, 0x62, 0xa1, 0x43, 0xe8, 0x99, 0x2b, 0xc2,
0xed, 0xb6, 0x52, 0x3c, 0x5e, 0x52, 0x64, 0x2d, 0x40, 0xab, 0x72, 0x36, 0x7a, 0x05, 0x16, 0xa6,
0x01, 0x8b, 0x08, 0x15, 0x32, 0xbd, 0x79, 0xb1, 0x16, 0xa4, 0xa7, 0xd9, 0xba, 0xd6, 0x2e, 0xf8,
0xe8, 0x00, 0xba, 0x1c, 0xfb, 0x31, 0x16, 0x59, 0xea, 0x1f, 0xad, 0x78, 0x55, 0xab, 0x5a, 0x98,
0x71, 0xa5, 0x4f, 0x42, 0x6f, 0x62, 0xcc, 0x39, 0xe6, 0x76, 0xaf, 0xd2, 0xe7, 0x34, 0x5b, 0x37,
0x3e, 0x73, 0x3e, 0x9a, 0x40, 0x3f, 0xc6, 0x6c, 0x4e, 0x7c, 0x4f, 0xc8, 0xd8, 0x5a, 0x4a, 0xfe,
0x74, 0x49, 0xee, 0x2e, 0x18, 0xda, 0x40, 0x51, 0x83, 0x1e, 0xe4, 0xdd, 0x09, 0x54, 0xdc, 0xb3,
0xf6, 0xf3, 0x2d, 0x58, 0x79, 0x60, 0xd7, 0x69, 0x3e, 0xa3, 0x57, 0x79, 0x11, 0xff, 0x03, 0xf1,
0x6b, 0x18, 0x96, 0x23, 0xbc, 0x96, 0xfa, 0x08, 0x36, 0x8a, 0x41, 0x5e, 0xd7, 0x73, 0x39, 0xce,
0x6b, 0xa9, 0xbf, 0x83, 0xcd, 0xe5, 0x30, 0xaf, 0xd5, 0xb1, 0xff, 0x6c, 0xc0, 0x30, 0x1b, 0x32,
0x3c, 0x4a, 0x62, 0x1f, 0xcb, 0xfe, 0xe5, 0xb3, 0x64, 0x16, 0xeb, 0xa1, 0xa3, 0xcc, 0x34, 0x5d,
0xf0, 0x59, 0x52, 0x18, 0x43, 0x92, 0x50, 0x2c, 0xd3, 0x9e, 0xcf, 0x12, 0x55, 0xa3, 0xb2, 0xda,
0x4d, 0x19, 0x67, 0x06, 0x9a, 0x8a, 0x31, 0xd0, 0x68, 0x66, 0x63, 0xb9, 0xda, 0x5b, 0x2b, 0xd5,
0x8e, 0xbe, 0x84, 0x7b, 0x71, 0x42, 0x29, 0xa1, 0x37, 0x33, 0x39, 0x94, 0x69, 0x12, 0xaa, 0xa6,
0xd8, 0x74, 0x07, 0x06, 0x9e, 0x30, 0xf6, 0x36, 0x09, 0x91, 0x03, 0x83, 0x84, 0x72, 0x3f, 0x98,
0x99, 0x5d, 0xab, 0xfe, 0xd8, 0x74, 0xfb, 0x0a, 0x3c, 0x56, 0xdb, 0x96, 0xb6, 0x16, 0x1c, 0xed,
0xb1, 0xab, 0x6d, 0x65, 0x2c, 0xed, 0x73, 0x17, 0x36, 0x35, 0x6f, 0x71, 0x06, 0xbb, 0xa7, 0x88,
0x43, 0x85, 0xbf, 0xc9, 0x0e, 0x81, 0xf6, 0x00, 0x95, 0x98, 0xda, 0xa8, 0xa5, 0xb8, 0x9b, 0x05,
0xae, 0xee, 0x5c, 0xbf, 0xd5, 0x61, 0x67, 0x12, 0x04, 0x57, 0x3f, 0x91, 0x38, 0xb8, 0xf0, 0x62,
0x91, 0xe6, 0x97, 0x4d, 0xda, 0x42, 0xd0, 0x4a, 0x92, 0x7c, 0xce, 0xa8, 0x6f, 0x99, 0x44, 0x9e,
0x0f, 0x17, 0xf9, 0x89, 0x86, 0xd0, 0x20, 0xcc, 0x34, 0xa9, 0x06, 0x61, 0x52, 0xc5, 0xa2, 0x58,
0x87, 0xae, 0xed, 0xaa, 0x6f, 0x99, 0x1a, 0xc2, 0x67, 0x11, 0x9d, 0x13, 0x8a, 0x55, 0xb4, 0x7a,
0x6e, 0x8f, 0xf0, 0x1f, 0xd5, 0x6f, 0xb5, 0x89, 0x77, 0xec, 0x7f, 0xde, 0xc4, 0x04, 0x76, 0x4e,
0xf0, 0xfc, 0xdf, 0xec, 0xc1, 0xf9, 0x50, 0x07, 0xb4, 0x6a, 0xe0, 0x3f, 0x3c, 0xc0, 0xa2, 0x35,
0xb5, 0x8b, 0xad, 0xa9, 0x7c, 0xb0, 0xce, 0xd2, 0xc1, 0xbe, 0x87, 0xfb, 0x15, 0xa7, 0x42, 0xbb,
0xd0, 0x8c, 0xae, 0x7f, 0x36, 0x2f, 0x90, 0x07, 0xb2, 0x43, 0xae, 0xb2, 0x5c, 0x49, 0xd9, 0xff,
0xd0, 0x82, 0xe1, 0x84, 0x31, 0x57, 0x3f, 0x3e, 0x2f, 0x53, 0xea, 0xa3, 0x43, 0xd8, 0x38, 0xc3,
0x62, 0xc2, 0x98, 0x19, 0xf4, 0xf7, 0x0b, 0x43, 0x3d, 0x7b, 0x47, 0x8e, 0xb6, 0x56, 0x9e, 0x75,
0x4e, 0x0d, 0xbd, 0x04, 0xd0, 0x4a, 0xd9, 0x4b, 0x11, 0x2a, 0xe8, 0x32, 0xd9, 0xf6, 0xca, 0x03,
0x41, 0x3e, 0x99, 0x9c, 0x1a, 0x3a, 0x80, 0xc1, 0x19, 0x16, 0x85, 0x39, 0x5b, 0xa5, 0x1e, 0x96,
0x7b, 0xbd, 0x53, 0x43, 0xaf, 0x61, 0xeb, 0x0c, 0x8b, 0xa5, 0x5e, 0xa2, 0xf6, 0x56, 0x7a, 0xc4,
0x8e, 0x50, 0x11, 0xd2, 0x34, 0xa7, 0x86, 0x7e, 0x80, 0x87, 0xd2, 0x7d, 0x55, 0x04, 0xab, 0xdc,
0x3f, 0xac, 0x0e, 0x24, 0x77, 0x6a, 0xe8, 0x18, 0xb6, 0x2b, 0x2b, 0x0d, 0xa9, 0xe9, 0xf6, 0xd1,
0x22, 0x1c, 0x59, 0x72, 0x59, 0xbf, 0xee, 0x95, 0x91, 0xca, 0x4a, 0xd1, 0x46, 0x3e, 0x5a, 0x44,
0x2b, 0x46, 0x2a, 0xaf, 0x3a, 0x32, 0x73, 0x76, 0xfe, 0x37, 0x8c, 0x5c, 0x77, 0xd4, 0xbf, 0x8f,
0x6f, 0xfe, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xab, 0x32, 0x17, 0x45, 0x99, 0x0c, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.
var _ context.Context var _ context.Context
var _ grpc.ClientConn var _ grpc.ClientConn
@ -1347,3 +1273,83 @@ var _AppRuntimeSync_serviceDesc = grpc.ServiceDesc{
Streams: []grpc.StreamDesc{}, Streams: []grpc.StreamDesc{},
Metadata: "app_runtime_server.proto", Metadata: "app_runtime_server.proto",
} }
func init() {
proto.RegisterFile("app_runtime_server.proto", fileDescriptor_app_runtime_server_52464b0f7eb03240)
}
var fileDescriptor_app_runtime_server_52464b0f7eb03240 = []byte{
// 1141 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xdb, 0x6e, 0x1b, 0x37,
0x10, 0xb5, 0xae, 0x96, 0x46, 0x96, 0x62, 0x33, 0x75, 0xb2, 0x56, 0x92, 0x26, 0xd9, 0x22, 0x85,
0x1f, 0x0c, 0xb7, 0x75, 0x61, 0xc4, 0x71, 0x82, 0x16, 0x82, 0x6d, 0xb8, 0x02, 0x1c, 0xd7, 0x58,
0x3b, 0xcf, 0xc2, 0x7a, 0x97, 0x71, 0x59, 0x6b, 0xb9, 0xec, 0x92, 0x6b, 0x40, 0x8f, 0xed, 0x2f,
0xe4, 0xbf, 0x8a, 0x7c, 0x52, 0xc1, 0x21, 0xf7, 0xa2, 0x4b, 0x90, 0xaa, 0x2d, 0xd0, 0xb7, 0xd5,
0x99, 0x73, 0x66, 0x38, 0x33, 0xe4, 0x90, 0x02, 0xc7, 0x17, 0x62, 0x94, 0xa4, 0x5c, 0xb1, 0x88,
0x8e, 0x24, 0x4d, 0xee, 0x68, 0xb2, 0x2b, 0x92, 0x58, 0xc5, 0xa4, 0x2a, 0xae, 0xdd, 0x55, 0x68,
0x9c, 0x44, 0x42, 0x4d, 0xdc, 0x6f, 0xa0, 0x77, 0x49, 0x93, 0x3b, 0x16, 0x50, 0x8f, 0xfe, 0x96,
0x52, 0xa9, 0xc8, 0x13, 0x00, 0x69, 0x90, 0x11, 0x0b, 0x9d, 0xca, 0xb3, 0xca, 0x76, 0xdb, 0x6b,
0x5b, 0x64, 0x18, 0xba, 0x7b, 0x70, 0xcf, 0x0a, 0x64, 0xa6, 0x78, 0x0a, 0x9d, 0x42, 0x21, 0xad,
0x04, 0x72, 0x89, 0x74, 0x77, 0xa0, 0x7b, 0x45, 0xb9, 0xcf, 0x55, 0xa6, 0x78, 0x04, 0x6d, 0x85,
0x40, 0x11, 0xa2, 0x65, 0x80, 0x61, 0xe8, 0xfe, 0x5e, 0x81, 0xee, 0xa5, 0xf2, 0x55, 0x2a, 0xdf,
0x52, 0x29, 0xfd, 0x1b, 0x4a, 0xf6, 0xa1, 0x29, 0x11, 0x70, 0x2a, 0xcf, 0x6a, 0xdb, 0x9d, 0xbd,
0x27, 0xbb, 0xe2, 0x7a, 0x77, 0x8a, 0x62, 0x7f, 0x9d, 0x70, 0x95, 0x4c, 0x3c, 0x4b, 0xee, 0xbf,
0x82, 0x4e, 0x09, 0x26, 0xeb, 0x50, 0xbb, 0xa5, 0x13, 0x1b, 0x4e, 0x7f, 0x92, 0x2f, 0xa0, 0x71,
0xe7, 0x8f, 0x53, 0xea, 0x54, 0x11, 0x33, 0x3f, 0x0e, 0xab, 0x07, 0x15, 0x77, 0x02, 0x9d, 0x63,
0x26, 0x6f, 0xb3, 0x05, 0x7c, 0x0b, 0x8d, 0x90, 0xc9, 0xdb, 0x2c, 0x7e, 0x5f, 0xc7, 0x2f, 0xd9,
0xf1, 0xdb, 0x06, 0x37, 0xc4, 0xfe, 0x01, 0x40, 0x01, 0x7e, 0x2e, 0x74, 0xa5, 0x1c, 0xfa, 0x10,
0x36, 0x6c, 0x81, 0x07, 0x42, 0x5c, 0xc4, 0xe1, 0x19, 0x93, 0x8a, 0xbc, 0x80, 0xba, 0x88, 0xc3,
0x2c, 0xfe, 0x06, 0xe6, 0x5f, 0x26, 0x79, 0x68, 0x76, 0xff, 0xac, 0x42, 0x77, 0x0a, 0xff, 0x4c,
0x37, 0x75, 0x23, 0x42, 0x2a, 0xc6, 0xf1, 0x44, 0x5b, 0x4d, 0x15, 0x5a, 0x06, 0x18, 0x86, 0xba,
0xaf, 0xd6, 0xa8, 0x26, 0x82, 0x3a, 0x35, 0xd3, 0x57, 0x03, 0x5d, 0x4d, 0x04, 0x25, 0x5b, 0xd0,
0x12, 0x71, 0x38, 0xe2, 0x7e, 0x44, 0x9d, 0x3a, 0x5a, 0x57, 0x45, 0x1c, 0x9e, 0xfb, 0x11, 0x25,
0x9b, 0xd0, 0xd4, 0x26, 0x26, 0x9c, 0x86, 0xa9, 0xad, 0x88, 0xc3, 0xa1, 0xd0, 0xcb, 0xd1, 0xb0,
0xed, 0x66, 0xd3, 0x2c, 0x47, 0xc4, 0xa1, 0xe9, 0x13, 0x19, 0x00, 0x04, 0x31, 0x57, 0x3e, 0xe3,
0x34, 0x91, 0xce, 0x2a, 0x26, 0xfb, 0x7c, 0x2e, 0xd9, 0xdd, 0xa3, 0x9c, 0x63, 0x6a, 0x5e, 0x12,
0xf5, 0xcf, 0xe0, 0xde, 0x8c, 0x79, 0x41, 0xf5, 0xbf, 0x2a, 0x57, 0xbf, 0xb3, 0xd7, 0xd5, 0x21,
0x72, 0x55, 0xb9, 0x19, 0xef, 0xa0, 0x9d, 0xe3, 0xe4, 0x05, 0xf4, 0xf2, 0x40, 0x26, 0x69, 0xe3,
0xb2, 0x9b, 0xa3, 0x98, 0xfa, 0x73, 0x58, 0x8b, 0x68, 0x14, 0x27, 0x93, 0xd1, 0x98, 0x45, 0x4c,
0x61, 0x8c, 0x9a, 0xd7, 0x31, 0xd8, 0x99, 0x86, 0xdc, 0x8f, 0x4d, 0x80, 0x63, 0x53, 0x66, 0xfe,
0x3e, 0x26, 0x8f, 0xa1, 0xad, 0xdd, 0x49, 0xe1, 0x07, 0x99, 0xcf, 0x02, 0x20, 0x2e, 0xac, 0xe9,
0x7a, 0xd1, 0xf7, 0xe9, 0x98, 0x4a, 0xaa, 0x6c, 0x9b, 0xa6, 0x30, 0xf2, 0x25, 0xd8, 0xbe, 0x44,
0x94, 0xab, 0xe9, 0x4e, 0x69, 0x84, 0xec, 0xd8, 0xfd, 0x53, 0xc7, 0x92, 0x3a, 0xb8, 0x7f, 0xf3,
0xf8, 0xbb, 0x17, 0x71, 0x68, 0x2b, 0x89, 0x2c, 0x72, 0x00, 0x2d, 0xbb, 0x45, 0xa4, 0xd3, 0x40,
0xc5, 0xe3, 0x19, 0x45, 0x36, 0x02, 0x8c, 0x2a, 0x67, 0x93, 0xd7, 0xd0, 0xa6, 0x3c, 0x14, 0x31,
0xe3, 0x4a, 0xb7, 0x37, 0x3f, 0xac, 0x25, 0xe9, 0x49, 0x66, 0x37, 0xda, 0x82, 0x4f, 0xf6, 0x61,
0x55, 0xd2, 0x20, 0xa1, 0x2a, 0x6b, 0xfd, 0xa3, 0xb9, 0xa8, 0x68, 0x35, 0xc2, 0x8c, 0xab, 0x63,
0x32, 0x7e, 0x93, 0x50, 0x29, 0xa9, 0x74, 0x5a, 0x0b, 0x63, 0x0e, 0x33, 0xbb, 0x8d, 0x99, 0xf3,
0xc9, 0x00, 0x3a, 0x09, 0x15, 0x63, 0x16, 0xf8, 0x4a, 0xd7, 0xb6, 0x8d, 0xf2, 0xa7, 0x33, 0x72,
0xaf, 0x60, 0x18, 0x07, 0x65, 0x0d, 0x79, 0x90, 0x4f, 0x27, 0xc0, 0xba, 0x67, 0xe3, 0xe7, 0x25,
0xb4, 0xf3, 0xc2, 0x2e, 0x33, 0x7c, 0xfa, 0xaf, 0xf3, 0x43, 0xfc, 0x0f, 0xc4, 0x6f, 0xa0, 0x37,
0x5d, 0xe1, 0xa5, 0xd4, 0x87, 0xb0, 0x56, 0x2e, 0xf2, 0xb2, 0x91, 0xa7, 0xeb, 0xbc, 0x94, 0xfa,
0x07, 0x58, 0x9f, 0x2d, 0xf3, 0x52, 0x13, 0xfb, 0x63, 0x0d, 0x7a, 0xd9, 0x25, 0x23, 0xe3, 0x34,
0x09, 0xa8, 0x9e, 0x5f, 0x81, 0x48, 0x47, 0x89, 0xb9, 0x74, 0xd0, 0x4d, 0xcd, 0x83, 0x40, 0xa4,
0xa5, 0x6b, 0x48, 0x13, 0xca, 0xc7, 0xb4, 0x15, 0x88, 0x14, 0xcf, 0xa8, 0x3e, 0xed, 0xf6, 0x18,
0x67, 0x0e, 0x6a, 0xc8, 0xe8, 0x1a, 0x34, 0xf3, 0x31, 0x7b, 0xda, 0xeb, 0x73, 0xa7, 0x9d, 0x7c,
0x0d, 0xf7, 0x92, 0x94, 0x73, 0xc6, 0x6f, 0x46, 0xfa, 0x52, 0xe6, 0x69, 0x84, 0x43, 0xb1, 0xe6,
0x75, 0x2d, 0x3c, 0x10, 0xe2, 0x3c, 0x8d, 0x88, 0x0b, 0xdd, 0x94, 0xcb, 0x20, 0x1c, 0xd9, 0x55,
0xe3, 0x7c, 0xac, 0x79, 0x1d, 0x04, 0x8f, 0x70, 0xd9, 0xda, 0x57, 0xc1, 0x31, 0x11, 0x57, 0x8d,
0xaf, 0x8c, 0x65, 0x62, 0x6e, 0xc3, 0xba, 0xe1, 0x15, 0x39, 0x38, 0x2d, 0x24, 0xf6, 0x10, 0x7f,
0x9b, 0x25, 0x41, 0x76, 0x80, 0x4c, 0x31, 0x8d, 0xd3, 0x36, 0x72, 0xd7, 0x4b, 0x5c, 0xe3, 0xf7,
0x3b, 0xd8, 0x2c, 0xe7, 0xa2, 0x7e, 0x61, 0x49, 0x88, 0x19, 0x01, 0x0a, 0x48, 0x91, 0xd1, 0x95,
0x36, 0xe9, 0xb4, 0x5e, 0x82, 0x53, 0x96, 0x30, 0xae, 0x68, 0xc2, 0xfd, 0x31, 0xaa, 0x3a, 0xa8,
0xda, 0x2c, 0x54, 0x43, 0x6b, 0x3d, 0x4f, 0x23, 0xf7, 0x8f, 0x0a, 0x6c, 0x0d, 0xc2, 0x10, 0x1d,
0x5d, 0xf8, 0x89, 0x9a, 0xe4, 0x1b, 0x5b, 0xaf, 0x9b, 0x40, 0x3d, 0x4d, 0xf3, 0x3b, 0x0d, 0xbf,
0xf5, 0x86, 0x91, 0xf9, 0x45, 0xa6, 0x3f, 0x49, 0x0f, 0xaa, 0x4c, 0xd8, 0x81, 0x58, 0x65, 0x42,
0xab, 0x44, 0x9c, 0x98, 0x36, 0x35, 0x3c, 0xfc, 0xd6, 0xdb, 0x80, 0xc9, 0x51, 0xcc, 0xc7, 0x8c,
0x53, 0xec, 0x4c, 0xcb, 0x6b, 0x31, 0xf9, 0x33, 0xfe, 0xc6, 0x45, 0xbc, 0x13, 0xff, 0xf3, 0x22,
0x06, 0xb0, 0x75, 0x4c, 0xc7, 0xff, 0x66, 0x0d, 0xee, 0x87, 0x0a, 0x90, 0x79, 0x07, 0xff, 0x61,
0x02, 0xc5, 0x18, 0x6c, 0x94, 0xc7, 0xe0, 0x74, 0x62, 0xcd, 0x99, 0xc4, 0x7e, 0x84, 0xfb, 0x0b,
0xb2, 0x22, 0xdb, 0x50, 0x8b, 0xaf, 0x7f, 0xb5, 0xaf, 0x9d, 0x07, 0x7a, 0x1a, 0xcf, 0xb3, 0x3c,
0x4d, 0xd9, 0xfb, 0x50, 0x87, 0xde, 0x40, 0x08, 0xcf, 0x3c, 0x74, 0x2f, 0x27, 0x3c, 0x20, 0x07,
0xb0, 0x76, 0x4a, 0xd5, 0x40, 0x08, 0xfb, 0xa8, 0xb8, 0x5f, 0x7a, 0x40, 0x64, 0x6f, 0xd6, 0xfe,
0xc6, 0xdc, 0x13, 0xd2, 0x5d, 0x21, 0xaf, 0x00, 0x8c, 0x52, 0xcf, 0x6d, 0x42, 0x4a, 0xba, 0x4c,
0xb6, 0x39, 0xf7, 0x18, 0xd1, 0xcf, 0x33, 0x77, 0x85, 0xec, 0x43, 0xf7, 0x94, 0xaa, 0xd2, 0x9d,
0xbe, 0x48, 0xdd, 0x9b, 0xbe, 0x57, 0xdc, 0x15, 0xf2, 0x06, 0x36, 0x4e, 0xa9, 0x9a, 0x99, 0x5b,
0xb8, 0xb6, 0xa9, 0x07, 0x73, 0x9f, 0x94, 0x21, 0x43, 0x73, 0x57, 0xc8, 0x4f, 0xf0, 0x50, 0x87,
0x5f, 0x54, 0xc1, 0x45, 0xe1, 0x1f, 0x2e, 0x2e, 0xa4, 0x74, 0x57, 0xc8, 0x11, 0x6c, 0x2e, 0x3c,
0x69, 0x04, 0x6f, 0xd2, 0x4f, 0x1e, 0xc2, 0x7e, 0x5b, 0x9b, 0xcd, 0x3f, 0x09, 0x74, 0xb2, 0xf0,
0xa4, 0x18, 0x27, 0x9f, 0x3c, 0x44, 0x73, 0x4e, 0x16, 0x6e, 0x75, 0x62, 0xef, 0xf4, 0xf1, 0xdf,
0x70, 0x72, 0xdd, 0xc4, 0x7f, 0x3a, 0xdf, 0xff, 0x15, 0x00, 0x00, 0xff, 0xff, 0x2c, 0x9a, 0x6a,
0xed, 0x05, 0x0d, 0x00, 0x00,
}

2
worker/server/pb/app_runtime_server.proto
View File

@ -73,6 +73,8 @@ message TenantResource {
int64 unscd_cpu_limit = 7; int64 unscd_cpu_limit = 7;
int64 unscd_memory_req = 8; int64 unscd_memory_req = 8;
int64 unscd_memory_limit = 9; int64 unscd_memory_limit = 9;
int64 running_app_third_num = 10;
int64 running_app_internal_num = 11;
} }
message AddThirdPartyEndpointsReq { message AddThirdPartyEndpointsReq {

14
worker/server/server.go
View File

@ -33,7 +33,7 @@ import (
"github.com/goodrain/rainbond/util" "github.com/goodrain/rainbond/util"
"github.com/goodrain/rainbond/worker/appm/store" "github.com/goodrain/rainbond/worker/appm/store"
"github.com/goodrain/rainbond/worker/appm/thirdparty/discovery" "github.com/goodrain/rainbond/worker/appm/thirdparty/discovery"
"github.com/goodrain/rainbond/worker/appm/types/v1" v1 "github.com/goodrain/rainbond/worker/appm/types/v1"
"github.com/goodrain/rainbond/worker/server/pb" "github.com/goodrain/rainbond/worker/server/pb"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/reflection" "google.golang.org/grpc/reflection"
@ -110,7 +110,17 @@ func (r *RuntimeServer) GetTenantResource(ctx context.Context, re *pb.TenantRequ
if res == nil { if res == nil {
return &tr, nil return &tr, nil
} }
tr.RunningAppNum = int64(len(r.store.GetTenantRunningApp(re.TenantId))) // tr.RunningAppNum = int64(len(r.store.GetTenantRunningApp(re.TenantId)))
// tr.RunningAppNum = int64(len(r.store.GetTenantRunningApp(re.TenantId)))
runningApps := r.store.GetTenantRunningApp(re.TenantId)
for _, app := range runningApps {
if app.ServiceKind == model.ServiceKindThirdParty {
tr.RunningAppThirdNum += 1
} else if app.ServiceKind == model.ServiceKindInternal {
tr.RunningAppInternalNum += 1
}
}
tr.RunningAppNum = int64(len(runningApps))
tr.CpuLimit = res.CPULimit tr.CpuLimit = res.CPULimit
tr.CpuRequest = res.CPURequest tr.CpuRequest = res.CPURequest
tr.MemoryLimit = res.MemoryLimit / 1024 / 1024 tr.MemoryLimit = res.MemoryLimit / 1024 / 1024