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

lock for creating local partition

Browse Source
This commit is contained in:
chrislu
2024-01-28 15:55:26 -08:00
parent 9e6ea80dff
commit a507069d19
3 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,13 +52,11 @@ 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 = b.localTopicManager.GetTopicPartition(t, p) localTopicPartition, err = b.GetOrGenLocalPartition(t, p)
if localTopicPartition == nil { if err != nil {
if localTopicPartition, err = b.genLocalPartitionFromFiler(t, p); err != nil { response.Error = fmt.Sprintf("topic %v partition %v not setup", initMessage.Topic, initMessage.Partition)
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)
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)
stream.Send(response) stream.Send(response)

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

@@ -22,13 +22,12 @@ 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)
waitIntervalCount := 0 waitIntervalCount := 0
var localTopicPartition *topic.LocalPartition var localTopicPartition *topic.LocalPartition
for localTopicPartition == nil { for localTopicPartition == nil {
localTopicPartition = b.localTopicManager.GetTopicPartition(t, partition) localTopicPartition, err = b.GetOrGenLocalPartition(t, partition)
if localTopicPartition == nil { if err != nil {
if localTopicPartition, err = b.genLocalPartitionFromFiler(t, partition); err != nil { glog.V(1).Infof("topic %v partition %v not setup", t, partition)
glog.V(1).Infof("topic %v partition %v not setup", t, partition)
}
} }
if localTopicPartition != nil { if localTopicPartition != nil {
break break
@@ -75,9 +74,9 @@ func (b *MessageQueueBroker) SubscribeMessage(req *mq_pb.SubscribeMessageRequest
startPosition = log_buffer.NewMessagePosition(offset.StartTsNs, -2) startPosition = log_buffer.NewMessagePosition(offset.StartTsNs, -2)
} }
if offset.StartType == mq_pb.PartitionOffsetStartType_EARLIEST { if offset.StartType == mq_pb.PartitionOffsetStartType_EARLIEST {
startPosition = log_buffer.NewMessagePosition(1, -2) startPosition = log_buffer.NewMessagePosition(1, -3)
} else if offset.StartType == mq_pb.PartitionOffsetStartType_LATEST { } else if offset.StartType == mq_pb.PartitionOffsetStartType_LATEST {
startPosition = log_buffer.NewMessagePosition(time.Now().UnixNano(), -2) startPosition = log_buffer.NewMessagePosition(time.Now().UnixNano(), -4)
} }
} }

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

@@ -56,6 +56,19 @@ 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) (localPartition *topic.LocalPartition, err error) {
b.accessLock.Lock()
defer b.accessLock.Unlock()
if localPartition = b.localTopicManager.GetTopicPartition(t, partition); localPartition == nil {
localPartition, err = b.genLocalPartitionFromFiler(t, partition)
if err != nil {
return nil, err
}
}
return localPartition, nil
}
func (b *MessageQueueBroker) genLocalPartitionFromFiler(t topic.Topic, partition topic.Partition) (localPartition *topic.LocalPartition, err error) { func (b *MessageQueueBroker) genLocalPartitionFromFiler(t topic.Topic, partition topic.Partition) (localPartition *topic.LocalPartition, err error) {
self := b.option.BrokerAddress() self := b.option.BrokerAddress()
conf, err := b.readTopicConfFromFiler(t) conf, err := b.readTopicConfFromFiler(t)