From 2ae4129d061407be4c0cbd7544e5277795f68549 Mon Sep 17 00:00:00 2001 From: Yaroslav Vorobiov Date: Fri, 23 Aug 2019 13:58:20 +0300 Subject: [PATCH] satellite/nodestats: add disqualified flag #2856 --- pkg/pb/nodestats.pb.go | 75 ++++++++++++++++++--------------- pkg/pb/nodestats.proto | 1 + proto.lock | 15 +++++++ satellite/nodestats/endpoint.go | 1 + 4 files changed, 59 insertions(+), 33 deletions(-) diff --git a/pkg/pb/nodestats.pb.go b/pkg/pb/nodestats.pb.go index aff8be9dc..63604bac1 100644 --- a/pkg/pb/nodestats.pb.go +++ b/pkg/pb/nodestats.pb.go @@ -129,6 +129,7 @@ var xxx_messageInfo_GetStatsRequest proto.InternalMessageInfo type GetStatsResponse struct { UptimeCheck *ReputationStats `protobuf:"bytes,1,opt,name=uptime_check,json=uptimeCheck,proto3" json:"uptime_check,omitempty"` AuditCheck *ReputationStats `protobuf:"bytes,2,opt,name=audit_check,json=auditCheck,proto3" json:"audit_check,omitempty"` + Disqualified *time.Time `protobuf:"bytes,3,opt,name=disqualified,proto3,stdtime" json:"disqualified,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -172,6 +173,13 @@ func (m *GetStatsResponse) GetAuditCheck() *ReputationStats { return nil } +func (m *GetStatsResponse) GetDisqualified() *time.Time { + if m != nil { + return m.Disqualified + } + return nil +} + type DailyStorageUsageRequest struct { From time.Time `protobuf:"bytes,1,opt,name=from,proto3,stdtime" json:"from"` To time.Time `protobuf:"bytes,2,opt,name=to,proto3,stdtime" json:"to"` @@ -317,39 +325,40 @@ func init() { func init() { proto.RegisterFile("nodestats.proto", fileDescriptor_e0b184ee117142aa) } var fileDescriptor_e0b184ee117142aa = []byte{ - // 503 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xc1, 0x6e, 0xd3, 0x40, - 0x10, 0x86, 0x59, 0x27, 0x84, 0x66, 0x9c, 0x36, 0xcd, 0x72, 0x31, 0xe6, 0xe0, 0xc8, 0x45, 0x6a, - 0xb8, 0xb8, 0x22, 0x70, 0x40, 0x42, 0x1c, 0x70, 0x2a, 0xa1, 0x5e, 0x38, 0x38, 0xe5, 0xc2, 0x01, - 0x6b, 0x63, 0x6f, 0x5d, 0x8b, 0x24, 0x6b, 0xbc, 0x63, 0x24, 0x5e, 0x81, 0x03, 0xe2, 0x0d, 0x78, - 0x05, 0x1e, 0x83, 0x27, 0xe0, 0xc0, 0xa1, 0xbc, 0x0a, 0xda, 0xb5, 0x63, 0x07, 0x53, 0x20, 0x1c, - 0xfd, 0xed, 0x3f, 0x7f, 0x66, 0xfe, 0x99, 0xc0, 0x70, 0x2d, 0x62, 0x2e, 0x91, 0xa1, 0xf4, 0xb2, - 0x5c, 0xa0, 0xa0, 0xfd, 0x1a, 0xd8, 0x90, 0x88, 0x44, 0x94, 0xd8, 0x76, 0x12, 0x21, 0x92, 0x25, - 0x3f, 0xd1, 0x5f, 0x8b, 0xe2, 0xe2, 0x04, 0xd3, 0x95, 0x92, 0xad, 0xb2, 0x52, 0xe0, 0x7e, 0x23, - 0x30, 0x0c, 0x78, 0x56, 0x20, 0xc3, 0x54, 0xac, 0xe7, 0xca, 0x80, 0x3a, 0x60, 0xa2, 0x40, 0xb6, - 0x0c, 0x23, 0x51, 0xac, 0xd1, 0x22, 0x63, 0x32, 0xe9, 0x04, 0xa0, 0xd1, 0x4c, 0x11, 0x7a, 0x04, - 0xfb, 0xb2, 0x88, 0x22, 0x2e, 0x65, 0x25, 0x31, 0xb4, 0x64, 0x50, 0xc1, 0x52, 0x74, 0x1f, 0x0e, - 0xf3, 0xda, 0x38, 0x64, 0xcb, 0xec, 0x92, 0x59, 0x9d, 0x31, 0x99, 0x90, 0x60, 0xd8, 0xf0, 0x67, - 0x0a, 0xd3, 0x63, 0xd8, 0x42, 0xe1, 0x82, 0x23, 0xb3, 0xba, 0x5a, 0x79, 0xd0, 0x60, 0x9f, 0x23, - 0x6b, 0x79, 0xca, 0x48, 0xe4, 0xdc, 0xba, 0xd9, 0xf6, 0x9c, 0x2b, 0xec, 0x8e, 0x60, 0xf8, 0x9c, - 0xa3, 0x1e, 0x28, 0xe0, 0x6f, 0x0b, 0x2e, 0xd1, 0xfd, 0x48, 0xe0, 0xb0, 0x61, 0x32, 0x13, 0x6b, - 0xc9, 0xe9, 0x53, 0x18, 0x14, 0x99, 0x4a, 0x25, 0x8c, 0x2e, 0x79, 0xf4, 0x46, 0x4f, 0x6b, 0x4e, - 0x6d, 0xaf, 0x09, 0xb8, 0x15, 0x4f, 0x60, 0x96, 0xfa, 0x99, 0x92, 0xd3, 0x27, 0x60, 0xb2, 0x22, - 0x4e, 0xb1, 0xaa, 0x36, 0xfe, 0x59, 0x0d, 0x5a, 0xae, 0x8b, 0xdd, 0x0f, 0x04, 0xac, 0x53, 0x96, - 0x2e, 0xdf, 0xcf, 0x51, 0xe4, 0x2c, 0xe1, 0x2f, 0x25, 0x4b, 0x78, 0xd5, 0x2d, 0x7d, 0x0c, 0xdd, - 0x8b, 0x5c, 0xac, 0xea, 0x86, 0xca, 0x4d, 0x7a, 0x9b, 0x4d, 0x7a, 0xe7, 0x9b, 0x4d, 0xfa, 0x7b, - 0x5f, 0xaf, 0x9c, 0x1b, 0x9f, 0x7e, 0x38, 0x24, 0xd0, 0x15, 0xf4, 0x11, 0x18, 0x28, 0xea, 0x56, - 0x76, 0xa9, 0x33, 0x50, 0xb8, 0x9f, 0x0d, 0xb8, 0x73, 0x4d, 0x33, 0x55, 0x4c, 0xc7, 0x70, 0x4b, - 0xcd, 0x14, 0xa6, 0xb1, 0x6e, 0x68, 0xe0, 0x1f, 0xa8, 0xe2, 0xef, 0x57, 0x4e, 0xef, 0x85, 0x88, - 0xf9, 0xd9, 0x69, 0xd0, 0x53, 0xcf, 0x67, 0x31, 0x65, 0x70, 0x3b, 0x56, 0x2e, 0xa1, 0x2c, 0x6d, - 0xc2, 0x42, 0xf9, 0x58, 0xc6, 0xb8, 0x33, 0x31, 0xa7, 0x0f, 0xb6, 0x82, 0xf9, 0xe3, 0x6f, 0x79, - 0xbf, 0xc0, 0x51, 0xdc, 0xd6, 0xd9, 0xef, 0x60, 0xb0, 0xfd, 0x4d, 0x5d, 0xd8, 0x67, 0x18, 0xe6, - 0x5c, 0x62, 0xa8, 0x8f, 0x54, 0x77, 0x48, 0x02, 0x93, 0x61, 0xc0, 0x25, 0x9e, 0x2b, 0x44, 0x7d, - 0xe8, 0xd7, 0xa7, 0xff, 0x5f, 0xd1, 0x34, 0x65, 0xd3, 0x2f, 0x04, 0xfa, 0x6a, 0xda, 0xf2, 0x5f, - 0x32, 0x83, 0xbd, 0xcd, 0x31, 0xd1, 0xed, 0x85, 0xb7, 0xae, 0xce, 0xbe, 0x7b, 0xed, 0x5b, 0x15, - 0xeb, 0x6b, 0x18, 0xfd, 0x96, 0x03, 0x3d, 0xfa, 0x7b, 0x4a, 0xa5, 0xed, 0xbd, 0x5d, 0xa2, 0xf4, - 0xbb, 0xaf, 0x8c, 0x6c, 0xb1, 0xe8, 0xe9, 0x09, 0x1f, 0xfe, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x83, - 0x66, 0x1e, 0x03, 0x36, 0x04, 0x00, 0x00, + // 524 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x41, 0x6e, 0xd3, 0x40, + 0x14, 0x65, 0x9c, 0x10, 0x9a, 0xef, 0xb4, 0x69, 0x86, 0x8d, 0x09, 0x8b, 0x44, 0x2e, 0x52, 0xc3, + 0xc6, 0x15, 0x81, 0x05, 0x12, 0x62, 0x81, 0x53, 0x09, 0xba, 0x61, 0xe1, 0x94, 0x0d, 0x0b, 0xac, + 0x89, 0x3d, 0x71, 0x2d, 0x9c, 0x8c, 0xeb, 0xf9, 0x46, 0xe2, 0x0a, 0xac, 0xb8, 0x01, 0x57, 0xe0, + 0x18, 0x9c, 0x00, 0x21, 0x16, 0xe5, 0x2a, 0x68, 0xc6, 0x8e, 0x9d, 0x9a, 0x52, 0xca, 0xd2, 0x6f, + 0xde, 0x7b, 0x9e, 0xf7, 0xfe, 0x1f, 0xe8, 0xaf, 0x45, 0xc8, 0x25, 0x32, 0x94, 0x4e, 0x9a, 0x09, + 0x14, 0xb4, 0x5b, 0x01, 0x43, 0x88, 0x44, 0x24, 0x0a, 0x78, 0x38, 0x8a, 0x84, 0x88, 0x12, 0x7e, + 0xa4, 0xbf, 0x16, 0xf9, 0xf2, 0x08, 0xe3, 0x95, 0xa2, 0xad, 0xd2, 0x82, 0x60, 0x7f, 0x27, 0xd0, + 0xf7, 0x78, 0x9a, 0x23, 0xc3, 0x58, 0xac, 0xe7, 0xca, 0x80, 0x8e, 0xc0, 0x44, 0x81, 0x2c, 0xf1, + 0x03, 0x91, 0xaf, 0xd1, 0x22, 0x63, 0x32, 0x69, 0x79, 0xa0, 0xa1, 0x99, 0x42, 0xe8, 0x01, 0xec, + 0xca, 0x3c, 0x08, 0xb8, 0x94, 0x25, 0xc5, 0xd0, 0x94, 0x5e, 0x09, 0x16, 0xa4, 0x87, 0xb0, 0x9f, + 0x55, 0xc6, 0x3e, 0x4b, 0xd2, 0x33, 0x66, 0xb5, 0xc6, 0x64, 0x42, 0xbc, 0x7e, 0x8d, 0xbf, 0x50, + 0x30, 0x3d, 0x84, 0x2d, 0xc8, 0x5f, 0x70, 0x64, 0x56, 0x5b, 0x33, 0xf7, 0x6a, 0xd8, 0xe5, 0xc8, + 0x1a, 0x9e, 0x32, 0x10, 0x19, 0xb7, 0x6e, 0x37, 0x3d, 0xe7, 0x0a, 0xb6, 0x07, 0xd0, 0x7f, 0xc9, + 0x51, 0x07, 0xf2, 0xf8, 0x79, 0xce, 0x25, 0xda, 0x3f, 0x08, 0xec, 0xd7, 0x98, 0x4c, 0xc5, 0x5a, + 0x72, 0xfa, 0x1c, 0x7a, 0x79, 0xaa, 0x5a, 0xf1, 0x83, 0x33, 0x1e, 0xbc, 0xd7, 0x69, 0xcd, 0xe9, + 0xd0, 0xa9, 0x0b, 0x6e, 0xd4, 0xe3, 0x99, 0x05, 0x7f, 0xa6, 0xe8, 0xf4, 0x19, 0x98, 0x2c, 0x0f, + 0x63, 0x2c, 0xd5, 0xc6, 0x3f, 0xd5, 0xa0, 0xe9, 0x85, 0xf8, 0x15, 0xf4, 0xc2, 0x58, 0x9e, 0xe7, + 0x2c, 0x89, 0x97, 0x31, 0x0f, 0x75, 0x3d, 0x4a, 0x5d, 0x0c, 0xcd, 0xd9, 0x0c, 0xcd, 0x39, 0xdd, + 0x0c, 0xcd, 0xdd, 0xf9, 0x76, 0x31, 0x22, 0x9f, 0x7f, 0x8d, 0x88, 0x77, 0x49, 0x69, 0x7f, 0x22, + 0x60, 0x1d, 0xb3, 0x38, 0xf9, 0x38, 0x47, 0x91, 0xb1, 0x88, 0xbf, 0x91, 0x2c, 0xe2, 0x65, 0x6e, + 0xfa, 0x14, 0xda, 0xcb, 0x4c, 0xac, 0xaa, 0x68, 0xd7, 0xdb, 0xdf, 0xd2, 0xf6, 0x5a, 0x41, 0x9f, + 0x80, 0x81, 0xa2, 0x0a, 0x75, 0x13, 0x9d, 0x81, 0xc2, 0xfe, 0x62, 0xc0, 0xbd, 0x2b, 0x2e, 0x53, + 0x16, 0x7e, 0x08, 0x77, 0x54, 0x3b, 0x7e, 0x1c, 0xea, 0x0b, 0xf5, 0xdc, 0x3d, 0x25, 0xfe, 0x79, + 0x31, 0xea, 0xbc, 0x16, 0x21, 0x3f, 0x39, 0xf6, 0x3a, 0xea, 0xf8, 0x24, 0xa4, 0x0c, 0xee, 0x86, + 0xca, 0xc5, 0x97, 0x85, 0x8d, 0x9f, 0x2b, 0x1f, 0xcb, 0x18, 0xb7, 0x26, 0xe6, 0xf4, 0xd1, 0x56, + 0xc5, 0x7f, 0xfd, 0x97, 0x73, 0x09, 0x1c, 0x84, 0x4d, 0xde, 0xf0, 0x03, 0xf4, 0xb6, 0xbf, 0xa9, + 0x0d, 0xbb, 0x0c, 0xfd, 0x8c, 0x4b, 0xf4, 0xf5, 0xba, 0xeb, 0x1b, 0x12, 0xcf, 0x64, 0xe8, 0x71, + 0x89, 0xa7, 0x0a, 0xa2, 0x2e, 0x74, 0xab, 0x47, 0xf4, 0x5f, 0xd5, 0xd4, 0xb2, 0xe9, 0x57, 0x02, + 0x5d, 0x95, 0xb6, 0x78, 0x6f, 0x33, 0xd8, 0xd9, 0xac, 0x25, 0xdd, 0x5e, 0x9d, 0xc6, 0xfe, 0x0e, + 0xef, 0x5f, 0x79, 0x56, 0xd6, 0xfa, 0x0e, 0x06, 0x7f, 0xf4, 0x40, 0x0f, 0xae, 0x6f, 0xa9, 0xb0, + 0x7d, 0x70, 0x93, 0x2a, 0xdd, 0xf6, 0x5b, 0x23, 0x5d, 0x2c, 0x3a, 0x3a, 0xe1, 0xe3, 0xdf, 0x01, + 0x00, 0x00, 0xff, 0xff, 0xad, 0xd9, 0x13, 0x89, 0x80, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/pkg/pb/nodestats.proto b/pkg/pb/nodestats.proto index bd6134983..e21b62914 100644 --- a/pkg/pb/nodestats.proto +++ b/pkg/pb/nodestats.proto @@ -27,6 +27,7 @@ message GetStatsRequest {} message GetStatsResponse { ReputationStats uptime_check = 1; ReputationStats audit_check = 2; + google.protobuf.Timestamp disqualified = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = true]; } message DailyStorageUsageRequest { diff --git a/proto.lock b/proto.lock index d3c379dde..dc7d5d700 100644 --- a/proto.lock +++ b/proto.lock @@ -4039,6 +4039,21 @@ "id": 2, "name": "audit_check", "type": "ReputationStats" + }, + { + "id": 3, + "name": "disqualified", + "type": "google.protobuf.Timestamp", + "options": [ + { + "name": "(gogoproto.stdtime)", + "value": "true" + }, + { + "name": "(gogoproto.nullable)", + "value": "true" + } + ] } ] }, diff --git a/satellite/nodestats/endpoint.go b/satellite/nodestats/endpoint.go index a700aa38e..7a37975b3 100644 --- a/satellite/nodestats/endpoint.go +++ b/satellite/nodestats/endpoint.go @@ -77,6 +77,7 @@ func (e *Endpoint) GetStats(ctx context.Context, req *pb.GetStatsRequest) (_ *pb ReputationBeta: node.Reputation.AuditReputationBeta, ReputationScore: auditScore, }, + Disqualified: node.Disqualified, }, nil }