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

refactor out FilerClientAccessor

Browse Source
This commit is contained in:
chrislu
2024-06-06 19:44:19 -07:00
parent 4093115ca9
commit 25b2850e7d
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
weed/mq/sub_coordinator/filer_client_accessor.go → weed/filer_client/filer_client_accessor.go
View File

@@ -1,4 +1,4 @@
package sub_coordinator package filer_client
import ( import (
"bytes" "bytes"

5
weed/mq/broker/broker_server.go
View File

@@ -1,6 +1,7 @@
package broker package broker
import ( import (
"github.com/seaweedfs/seaweedfs/weed/filer_client"
"github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/glog"
"github.com/seaweedfs/seaweedfs/weed/mq/pub_balancer" "github.com/seaweedfs/seaweedfs/weed/mq/pub_balancer"
"github.com/seaweedfs/seaweedfs/weed/mq/sub_coordinator" "github.com/seaweedfs/seaweedfs/weed/mq/sub_coordinator"
@@ -47,7 +48,7 @@ type MessageQueueBroker struct {
lockAsBalancer *cluster.LiveLock lockAsBalancer *cluster.LiveLock
SubCoordinator *sub_coordinator.SubCoordinator SubCoordinator *sub_coordinator.SubCoordinator
accessLock sync.Mutex accessLock sync.Mutex
fca *sub_coordinator.FilerClientAccessor fca *filer_client.FilerClientAccessor
} }
func NewMessageBroker(option *MessageQueueBrokerOption, grpcDialOption grpc.DialOption) (mqBroker *MessageQueueBroker, err error) { func NewMessageBroker(option *MessageQueueBrokerOption, grpcDialOption grpc.DialOption) (mqBroker *MessageQueueBroker, err error) {
@@ -64,7 +65,7 @@ func NewMessageBroker(option *MessageQueueBrokerOption, grpcDialOption grpc.Dial
PubBalancer: pubBalancer, PubBalancer: pubBalancer,
SubCoordinator: subCoordinator, SubCoordinator: subCoordinator,
} }
fca := &sub_coordinator.FilerClientAccessor{ fca := &filer_client.FilerClientAccessor{
GetFiler: mqBroker.GetFiler, GetFiler: mqBroker.GetFiler,
GetGrpcDialOption: mqBroker.GetGrpcDialOption, GetGrpcDialOption: mqBroker.GetGrpcDialOption,
} }

5
weed/mq/sub_coordinator/consumer_group.go
View File

@@ -3,6 +3,7 @@ package sub_coordinator
import ( import (
"fmt" "fmt"
cmap "github.com/orcaman/concurrent-map/v2" cmap "github.com/orcaman/concurrent-map/v2"
"github.com/seaweedfs/seaweedfs/weed/filer_client"
"github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/glog"
"github.com/seaweedfs/seaweedfs/weed/mq/topic" "github.com/seaweedfs/seaweedfs/weed/mq/topic"
"github.com/seaweedfs/seaweedfs/weed/pb/mq_pb" "github.com/seaweedfs/seaweedfs/weed/pb/mq_pb"
@@ -15,11 +16,11 @@ type ConsumerGroup struct {
ConsumerGroupInstances cmap.ConcurrentMap[string, *ConsumerGroupInstance] ConsumerGroupInstances cmap.ConcurrentMap[string, *ConsumerGroupInstance]
Market *Market Market *Market
reBalanceTimer *time.Timer reBalanceTimer *time.Timer
filerClientAccessor *FilerClientAccessor filerClientAccessor *filer_client.FilerClientAccessor
stopCh chan struct{} stopCh chan struct{}
} }
func NewConsumerGroup(t *mq_pb.Topic, reblanceSeconds int32, filerClientAccessor *FilerClientAccessor) *ConsumerGroup { func NewConsumerGroup(t *mq_pb.Topic, reblanceSeconds int32, filerClientAccessor *filer_client.FilerClientAccessor) *ConsumerGroup {
cg := &ConsumerGroup{ cg := &ConsumerGroup{
topic: topic.FromPbTopic(t), topic: topic.FromPbTopic(t),
ConsumerGroupInstances: cmap.New[*ConsumerGroupInstance](), ConsumerGroupInstances: cmap.New[*ConsumerGroupInstance](),

3
weed/mq/sub_coordinator/sub_coordinator.go
View File

@@ -3,6 +3,7 @@ package sub_coordinator
import ( import (
"fmt" "fmt"
cmap "github.com/orcaman/concurrent-map/v2" cmap "github.com/orcaman/concurrent-map/v2"
"github.com/seaweedfs/seaweedfs/weed/filer_client"
"github.com/seaweedfs/seaweedfs/weed/pb/mq_pb" "github.com/seaweedfs/seaweedfs/weed/pb/mq_pb"
) )
@@ -18,7 +19,7 @@ type TopicConsumerGroups struct {
type SubCoordinator struct { type SubCoordinator struct {
// map topic name to consumer groups // map topic name to consumer groups
TopicSubscribers cmap.ConcurrentMap[string, *TopicConsumerGroups] TopicSubscribers cmap.ConcurrentMap[string, *TopicConsumerGroups]
FilerClientAccessor *FilerClientAccessor FilerClientAccessor *filer_client.FilerClientAccessor
} }
func NewSubCoordinator() *SubCoordinator { func NewSubCoordinator() *SubCoordinator {