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

pub/sub broker only check local assigned partitions

Browse Source
This commit is contained in:
chrislu
2024-01-22 00:49:57 -08:00
parent b0a2e9aea3
commit c77d35313e
2 changed files with 16 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,10 +52,10 @@ func (b *MessageQueueBroker) PublishMessage(stream mq_pb.SeaweedMessaging_Publis
var p topic.Partition var p topic.Partition
if initMessage != nil { if initMessage != nil {
t, p = topic.FromPbTopic(initMessage.Topic), topic.FromPbPartition(initMessage.Partition) t, p = topic.FromPbTopic(initMessage.Topic), topic.FromPbPartition(initMessage.Partition)
localTopicPartition, err = b.loadLocalTopicPartition(t, p) localTopicPartition = b.localTopicManager.GetTopicPartition(t, p)
if err != nil { if localTopicPartition == nil {
response.Error = fmt.Sprintf("topic %v partition %v not setup: %v", initMessage.Topic, initMessage.Partition, err) response.Error = fmt.Sprintf("topic %v partition %v not setup", initMessage.Topic, initMessage.Partition)
glog.Errorf("topic %v partition %v not setup: %v", initMessage.Topic, initMessage.Partition, err) 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)
@@ -141,14 +141,6 @@ func (b *MessageQueueBroker) PublishMessage(stream mq_pb.SeaweedMessaging_Publis
return nil return nil
} }
func (b *MessageQueueBroker) loadLocalTopicPartition(t topic.Topic, p topic.Partition) (localTopicPartition *topic.LocalPartition, err error) {
localTopicPartition = b.localTopicManager.GetTopicPartition(t, p)
if localTopicPartition == nil {
localTopicPartition, err = b.loadLocalTopicPartitionFromFiler(t, p)
}
return localTopicPartition, err
}
func (b *MessageQueueBroker) loadLocalTopicPartitionFromFiler(t topic.Topic, p topic.Partition) (localTopicPartition *topic.LocalPartition, err error) { func (b *MessageQueueBroker) loadLocalTopicPartitionFromFiler(t topic.Topic, p topic.Partition) (localTopicPartition *topic.LocalPartition, err error) {
self := b.option.BrokerAddress() self := b.option.BrokerAddress()

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

@@ -24,31 +24,21 @@ func (b *MessageQueueBroker) SubscribeMessage(req *mq_pb.SubscribeMessageRequest
var localTopicPartition *topic.LocalPartition var localTopicPartition *topic.LocalPartition
localTopicPartition = b.localTopicManager.GetTopicPartition(t, partition) localTopicPartition = b.localTopicManager.GetTopicPartition(t, partition)
for localTopicPartition == nil { for localTopicPartition == nil {
localTopicPartition, err = b.loadLocalTopicPartitionFromFiler(t, partition) time.Sleep(337 * time.Millisecond)
// if not created, return error // Check if the client has disconnected by monitoring the context
if err != nil { select {
stream.Send(&mq_pb.SubscribeMessageResponse{ case <-ctx.Done():
Message: &mq_pb.SubscribeMessageResponse_Ctrl{ err := ctx.Err()
Ctrl: &mq_pb.SubscribeMessageResponse_CtrlMessage{ if err == context.Canceled {
Error: fmt.Sprintf("topic %v partition %v not setup: %v", t, partition, err), // Client disconnected
},
},
})
time.Sleep(337 * time.Millisecond)
// Check if the client has disconnected by monitoring the context
select {
case <-ctx.Done():
err := ctx.Err()
if err == context.Canceled {
// Client disconnected
return nil
}
glog.V(0).Infof("Subscriber %s disconnected: %v", clientName, err)
return nil return nil
default:
// Continue processing the request
} }
glog.V(0).Infof("Subscriber %s disconnected: %v", clientName, err)
return nil
default:
// Continue processing the request
} }
localTopicPartition = b.localTopicManager.GetTopicPartition(t, partition)
} }
localTopicPartition.Subscribers.AddSubscriber(clientName, topic.NewLocalSubscriber()) localTopicPartition.Subscribers.AddSubscriber(clientName, topic.NewLocalSubscriber())