gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
chrislu
2024-03-24 13:04:59 -07:00
parent 205d2285f3
commit d558a58946
3 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
weed/mq/broker/broker_grpc_pub.go
View File

@@ -39,7 +39,6 @@ func (b *MessageQueueBroker) PublishMessage(stream mq_pb.SeaweedMessaging_Publis
// 2. find the topic metadata owning filer // 2. find the topic metadata owning filer
// 3. write to the filer // 3. write to the filer
var localTopicPartition *topic.LocalPartition
req, err := stream.Recv() req, err := stream.Recv()
if err != nil { if err != nil {
return err return err
@@ -56,18 +55,13 @@ func (b *MessageQueueBroker) PublishMessage(stream mq_pb.SeaweedMessaging_Publis
// get or generate a local partition // get or generate a local partition
t, p := topic.FromPbTopic(initMessage.Topic), topic.FromPbPartition(initMessage.Partition) t, p := topic.FromPbTopic(initMessage.Topic), topic.FromPbPartition(initMessage.Partition)
conf, readConfErr := b.readTopicConfFromFiler(t) localTopicPartition, getOrGenErr := b.GetOrGenerateLocalPartition(t, p)
if readConfErr != nil { if getOrGenErr != nil {
response.Error = fmt.Sprintf("topic %v not found: %v", initMessage.Topic, readConfErr) response.Error = fmt.Sprintf("topic %v not found: %v", t, getOrGenErr)
glog.Errorf("topic %v not found: %v", initMessage.Topic, readConfErr) glog.Errorf("topic %v not found: %v", t, getOrGenErr)
return stream.Send(response)
}
localTopicPartition, _, err = b.GetOrGenLocalPartition(t, p, conf)
if err != nil {
response.Error = fmt.Sprintf("topic %v partition %v not setup", initMessage.Topic, initMessage.Partition)
glog.Errorf("topic %v partition %v not setup", initMessage.Topic, initMessage.Partition)
return stream.Send(response) return stream.Send(response)
} }
ackInterval = int(initMessage.AckInterval) ackInterval = int(initMessage.AckInterval)
// connect to follower brokers // connect to follower brokers

29
weed/mq/broker/broker_grpc_sub.go
View File

@@ -27,17 +27,9 @@ func (b *MessageQueueBroker) SubscribeMessage(req *mq_pb.SubscribeMessageRequest
glog.V(0).Infof("Subscriber %s on %v %v connected", req.GetInit().ConsumerId, t, partition) glog.V(0).Infof("Subscriber %s on %v %v connected", req.GetInit().ConsumerId, t, partition)
// get or generate a local partition localTopicPartition, getOrGenErr := b.GetOrGenerateLocalPartition(t, partition)
var localTopicPartition *topic.LocalPartition if getOrGenErr != nil {
conf, readConfErr := b.readTopicConfFromFiler(t) return getOrGenErr
if readConfErr != nil {
glog.Errorf("topic %v not found: %v", initMessage.Topic, readConfErr)
return fmt.Errorf("topic %v not found: %v", initMessage.Topic, readConfErr)
}
localTopicPartition, _, err = b.GetOrGenLocalPartition(t, partition, conf)
if err != nil {
glog.Errorf("topic %v partition %v not setup", initMessage.Topic, partition)
return fmt.Errorf("topic %v partition %v not setup", initMessage.Topic, partition)
} }
localTopicPartition.Subscribers.AddSubscriber(clientName, topic.NewLocalSubscriber()) localTopicPartition.Subscribers.AddSubscriber(clientName, topic.NewLocalSubscriber())
@@ -105,6 +97,21 @@ func (b *MessageQueueBroker) SubscribeMessage(req *mq_pb.SubscribeMessageRequest
}) })
} }
func (b *MessageQueueBroker) GetOrGenerateLocalPartition(t topic.Topic, partition topic.Partition) (localTopicPartition *topic.LocalPartition, getOrGenError error) {
// get or generate a local partition
conf, readConfErr := b.readTopicConfFromFiler(t)
if readConfErr != nil {
glog.Errorf("topic %v not found: %v", t, readConfErr)
return nil, fmt.Errorf("topic %v not found: %v", t, readConfErr)
}
localTopicPartition, _, getOrGenError = b.doGetOrGenLocalPartition(t, partition, conf)
if getOrGenError != nil {
glog.Errorf("topic %v partition %v not setup: %v", t, partition, getOrGenError)
return nil, fmt.Errorf("topic %v partition %v not setup: %v", t, partition, getOrGenError)
}
return localTopicPartition, nil
}
func getRequestPosition(offset *mq_pb.PartitionOffset) (startPosition log_buffer.MessagePosition) { func getRequestPosition(offset *mq_pb.PartitionOffset) (startPosition log_buffer.MessagePosition) {
if offset.StartTsNs != 0 { if offset.StartTsNs != 0 {
startPosition = log_buffer.NewMessagePosition(offset.StartTsNs, -2) startPosition = log_buffer.NewMessagePosition(offset.StartTsNs, -2)

2
weed/mq/broker/broker_topic_conf_read_write.go
View File

@@ -56,7 +56,7 @@ func (b *MessageQueueBroker) readTopicConfFromFiler(t topic.Topic) (conf *mq_pb.
return conf, nil return conf, nil
} }
func (b *MessageQueueBroker) GetOrGenLocalPartition(t topic.Topic, partition topic.Partition, conf *mq_pb.ConfigureTopicResponse) (localPartition *topic.LocalPartition, isGenerated bool, err error) { func (b *MessageQueueBroker) doGetOrGenLocalPartition(t topic.Topic, partition topic.Partition, conf *mq_pb.ConfigureTopicResponse) (localPartition *topic.LocalPartition, isGenerated bool, err error) {
b.accessLock.Lock() b.accessLock.Lock()
defer b.accessLock.Unlock() defer b.accessLock.Unlock()