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

refactor

Browse source
This commit is contained in:
Chris Lu 2020-05-12 08:48:00 -07:00
parent 4b7fa31468
commit 2f243f5b0b
4 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
weed/messaging/broker/broker_grpc_server_publish.go
View file

@ -57,8 +57,8 @@ func (broker *MessageBroker) Publish(stream messaging_pb.SeaweedMessaging_Publis
return fmt.Errorf("channel is already closed") return fmt.Errorf("channel is already closed")
} }
tl := broker.topicLocks.RequestLock(tp, topicConfig, true) tl := broker.topicManager.RequestLock(tp, topicConfig, true)
defer broker.topicLocks.ReleaseLock(tp, true) defer broker.topicManager.ReleaseLock(tp, true)
md5hash := md5.New() md5hash := md5.New()
// process each message // process each message

4
weed/messaging/broker/broker_grpc_server_subscribe.go
View file

@ -47,8 +47,8 @@ func (broker *MessageBroker) Subscribe(stream messaging_pb.SeaweedMessaging_Subs
Topic: in.Init.Topic, Topic: in.Init.Topic,
Partition: in.Init.Partition, Partition: in.Init.Partition,
} }
lock := broker.topicLocks.RequestLock(tp, topicConfig, false) lock := broker.topicManager.RequestLock(tp, topicConfig, false)
defer broker.topicLocks.ReleaseLock(tp, false) defer broker.topicManager.ReleaseLock(tp, false)
lastReadTime := time.Now() lastReadTime := time.Now()
switch in.Init.StartPosition { switch in.Init.StartPosition {

6
weed/messaging/broker/broker_server.go
View file

@ -24,7 +24,7 @@ type MessageBrokerOption struct {
type MessageBroker struct { type MessageBroker struct {
option *MessageBrokerOption option *MessageBrokerOption
grpcDialOption grpc.DialOption grpcDialOption grpc.DialOption
topicLocks *TopicLocks topicManager *TopicManager
} }
func NewMessageBroker(option *MessageBrokerOption, grpcDialOption grpc.DialOption) (messageBroker *MessageBroker, err error) { func NewMessageBroker(option *MessageBrokerOption, grpcDialOption grpc.DialOption) (messageBroker *MessageBroker, err error) {
@ -34,7 +34,7 @@ func NewMessageBroker(option *MessageBrokerOption, grpcDialOption grpc.DialOptio
grpcDialOption: grpcDialOption, grpcDialOption: grpcDialOption,
} }
messageBroker.topicLocks = NewTopicLocks(messageBroker) messageBroker.topicManager = NewTopicManager(messageBroker)
messageBroker.checkFilers() messageBroker.checkFilers()
@ -58,7 +58,7 @@ func (broker *MessageBroker) keepConnectedToOneFiler() {
Name: broker.option.Ip, Name: broker.option.Ip,
GrpcPort: uint32(broker.option.Port), GrpcPort: uint32(broker.option.Port),
} }
for _, tp := range broker.topicLocks.ListTopicPartitions() { for _, tp := range broker.topicManager.ListTopicPartitions() {
initRequest.Resources = append(initRequest.Resources, tp.String()) initRequest.Resources = append(initRequest.Resources, tp.String())
} }
if err := stream.Send(&filer_pb.KeepConnectedRequest{ if err := stream.Send(&filer_pb.KeepConnectedRequest{

48
weed/messaging/broker/topic_lock.go → weed/messaging/broker/topic_manager.go
View file

@ -25,7 +25,7 @@ func (tp *TopicPartition) String() string {
return fmt.Sprintf(TopicPartitionFmt, tp.Namespace, tp.Topic, tp.Partition) return fmt.Sprintf(TopicPartitionFmt, tp.Namespace, tp.Topic, tp.Partition)
} }
type TopicLock struct { type TopicControl struct {
sync.Mutex sync.Mutex
cond *sync.Cond cond *sync.Cond
subscriberCount int subscriberCount int
@ -33,20 +33,20 @@ type TopicLock struct {
logBuffer *log_buffer.LogBuffer logBuffer *log_buffer.LogBuffer
} }
type TopicLocks struct { type TopicManager struct {
sync.Mutex sync.Mutex
locks map[TopicPartition]*TopicLock topicControls map[TopicPartition]*TopicControl
broker *MessageBroker broker *MessageBroker
} }
func NewTopicLocks(messageBroker *MessageBroker) *TopicLocks { func NewTopicManager(messageBroker *MessageBroker) *TopicManager {
return &TopicLocks{ return &TopicManager{
locks: make(map[TopicPartition]*TopicLock), topicControls: make(map[TopicPartition]*TopicControl),
broker: messageBroker, broker: messageBroker,
} }
} }
func (locks *TopicLocks) buildLogBuffer(tl *TopicLock, tp TopicPartition, topicConfig *messaging_pb.TopicConfiguration) *log_buffer.LogBuffer { func (tm *TopicManager) buildLogBuffer(tl *TopicControl, tp TopicPartition, topicConfig *messaging_pb.TopicConfiguration) *log_buffer.LogBuffer {
flushFn := func(startTime, stopTime time.Time, buf []byte) { flushFn := func(startTime, stopTime time.Time, buf []byte) {
@ -63,7 +63,7 @@ func (locks *TopicLocks) buildLogBuffer(tl *TopicLock, tp TopicPartition, topicC
tp.Partition, tp.Partition,
) )
if err := locks.broker.appendToFile(targetFile, topicConfig, buf); err != nil { if err := tm.broker.appendToFile(targetFile, topicConfig, buf); err != nil {
glog.V(0).Infof("log write failed %s: %v", targetFile, err) glog.V(0).Infof("log write failed %s: %v", targetFile, err)
} }
} }
@ -74,16 +74,16 @@ func (locks *TopicLocks) buildLogBuffer(tl *TopicLock, tp TopicPartition, topicC
return logBuffer return logBuffer
} }
func (tl *TopicLocks) RequestLock(partition TopicPartition, topicConfig *messaging_pb.TopicConfiguration, isPublisher bool) *TopicLock { func (tm *TopicManager) RequestLock(partition TopicPartition, topicConfig *messaging_pb.TopicConfiguration, isPublisher bool) *TopicControl {
tl.Lock() tm.Lock()
defer tl.Unlock() defer tm.Unlock()
lock, found := tl.locks[partition] lock, found := tm.topicControls[partition]
if !found { if !found {
lock = &TopicLock{} lock = &TopicControl{}
lock.cond = sync.NewCond(&lock.Mutex) lock.cond = sync.NewCond(&lock.Mutex)
tl.locks[partition] = lock tm.topicControls[partition] = lock
lock.logBuffer = tl.buildLogBuffer(lock, partition, topicConfig) lock.logBuffer = tm.buildLogBuffer(lock, partition, topicConfig)
} }
if isPublisher { if isPublisher {
lock.publisherCount++ lock.publisherCount++
@ -93,11 +93,11 @@ func (tl *TopicLocks) RequestLock(partition TopicPartition, topicConfig *messagi
return lock return lock
} }
func (tl *TopicLocks) ReleaseLock(partition TopicPartition, isPublisher bool) { func (tm *TopicManager) ReleaseLock(partition TopicPartition, isPublisher bool) {
tl.Lock() tm.Lock()
defer tl.Unlock() defer tm.Unlock()
lock, found := tl.locks[partition] lock, found := tm.topicControls[partition]
if !found { if !found {
return return
} }
@ -107,16 +107,16 @@ func (tl *TopicLocks) ReleaseLock(partition TopicPartition, isPublisher bool) {
lock.subscriberCount-- lock.subscriberCount--
} }
if lock.subscriberCount <= 0 && lock.publisherCount <= 0 { if lock.subscriberCount <= 0 && lock.publisherCount <= 0 {
delete(tl.locks, partition) delete(tm.topicControls, partition)
lock.logBuffer.Shutdown() lock.logBuffer.Shutdown()
} }
} }
func (tl *TopicLocks) ListTopicPartitions() (tps []TopicPartition) { func (tm *TopicManager) ListTopicPartitions() (tps []TopicPartition) {
tl.Lock() tm.Lock()
defer tl.Unlock() defer tm.Unlock()
for k := range tl.locks { for k := range tm.topicControls {
tps = append(tps, k) tps = append(tps, k)
} }
return return