gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

wip

Browse source
This commit is contained in:
chrislu 2023-09-19 14:02:08 -07:00
parent cf28108ea4
commit 6c6655de9d
4 changed files with 559 additions and 445 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
weed/mq/broker/broker_grpc_balancer.go
View file

@ -40,9 +40,7 @@ func (broker *MessageQueueBroker) ConnectToBalancer(stream mq_pb.SeaweedMessagin
return status.Errorf(codes.Unavailable, "not current broker balancer") return status.Errorf(codes.Unavailable, "not current broker balancer")
} }
if receivedStats := req.GetStats(); receivedStats != nil { if receivedStats := req.GetStats(); receivedStats != nil {
brokerStats.TopicPartitionCount = receivedStats.TopicPartitionCount brokerStats.UpdateStats(receivedStats)
brokerStats.ConsumerCount = receivedStats.ConsumerCount
brokerStats.CpuUsagePercent = receivedStats.CpuUsagePercent
glog.V(3).Infof("broker %s stats: %+v", initMessage.Broker, brokerStats) glog.V(3).Infof("broker %s stats: %+v", initMessage.Broker, brokerStats)
} }

18
weed/mq/topic/local_manager.go
View file

@ -58,11 +58,23 @@ func (manager *LocalTopicManager) RemoveTopicPartition(topic Topic, partition Pa
} }
func (manager *LocalTopicManager) CollectStats(duration time.Duration) *mq_pb.BrokerStats { func (manager *LocalTopicManager) CollectStats(duration time.Duration) *mq_pb.BrokerStats {
stats := &mq_pb.BrokerStats{} stats := &mq_pb.BrokerStats{
Stats: make(map[string]*mq_pb.TopicPartitionStats),
}
manager.topics.IterCb(func(topic string, localTopic *LocalTopic) { manager.topics.IterCb(func(topic string, localTopic *LocalTopic) {
for _, localPartition := range localTopic.Partitions { for _, localPartition := range localTopic.Partitions {
stats.TopicPartitionCount++ stats.Stats[topic] = &mq_pb.TopicPartitionStats{
stats.ConsumerCount += localPartition.ConsumerCount Topic: &mq_pb.Topic{
Namespace: string(localTopic.Namespace),
Name: localTopic.Name,
},
Partition: &mq_pb.Partition{
RingSize: localPartition.RingSize,
RangeStart: localPartition.RangeStart,
RangeStop: localPartition.RangeStop,
},
ConsumerCount: localPartition.ConsumerCount,
}
} }
}) })

13
weed/pb/mq.proto
View file

@ -105,10 +105,17 @@ message CheckBrokerLoadResponse {
////////////////////////////////////////////////// //////////////////////////////////////////////////
message BrokerStats { message BrokerStats {
int32 topic_partition_count = 1; int32 cpu_usage_percent = 1;
int32 consumer_count = 2; map<string, TopicPartitionStats> stats = 2;
int32 cpu_usage_percent = 3;
} }
message TopicPartitionStats {
Topic topic = 1;
Partition partition = 2;
int32 consumer_count = 3;
bool is_leader = 4;
}
message ConnectToBalancerRequest { message ConnectToBalancerRequest {
message InitMessage { message InitMessage {
string broker = 1; string broker = 1;

969
weed/pb/mq_pb/mq.pb.go
View file

File diff suppressed because it is too large Load diff