dynamically connect to a filer

2 files changed, 0 insertions, 31 deletions

diff --git a/weed/command/mq_broker.go b/weed/command/mq_broker.go
index cce77bf8e..1b31d0141 100644
--- a/weed/command/mq_broker.go
+++ b/weed/command/mq_broker.go
@@ -1,10 +1,6 @@
 package command
 
 import (
-	"context"
-	"fmt"
-	"time"
-
 	"google.golang.org/grpc/reflection"
 
 	"github.com/chrislusf/seaweedfs/weed/util/grace"
@@ -12,7 +8,6 @@ import (
 	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/chrislusf/seaweedfs/weed/mq/broker"
 	"github.com/chrislusf/seaweedfs/weed/pb"
-	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
 	"github.com/chrislusf/seaweedfs/weed/pb/mq_pb"
 	"github.com/chrislusf/seaweedfs/weed/security"
 	"github.com/chrislusf/seaweedfs/weed/util"
@@ -26,7 +21,6 @@ type MessageQueueBrokerOptions struct {
 	masters       map[string]pb.ServerAddress
 	mastersString *string
 	filerGroup    *string
-	filer         *string
 	ip            *string
 	port          *int
 	dataCenter    *string
@@ -38,7 +32,6 @@ type MessageQueueBrokerOptions struct {
 func init() {
 	cmdMqBroker.Run = runMqBroker // break init cycle
 	mqBrokerStandaloneOptions.mastersString = cmdMqBroker.Flag.String("master", "localhost:9333", "comma-separated master servers")
-	mqBrokerStandaloneOptions.filer = cmdMqBroker.Flag.String("filer", "localhost:8888", "filer server address")
 	mqBrokerStandaloneOptions.filerGroup = cmdMqBroker.Flag.String("filerGroup", "", "share metadata with other filers in the same filerGroup")
 	mqBrokerStandaloneOptions.ip = cmdMqBroker.Flag.String("ip", util.DetectedHostAddress(), "broker host address")
 	mqBrokerStandaloneOptions.port = cmdMqBroker.Flag.Int("port", 17777, "broker gRPC listen port")
@@ -73,40 +66,17 @@ func (mqBrokerOpt *MessageQueueBrokerOptions) startQueueServer() bool {
 
 	grace.SetupProfiling(*mqBrokerStandaloneOptions.cpuprofile, *mqBrokerStandaloneOptions.memprofile)
 
-	filerAddress := pb.ServerAddress(*mqBrokerOpt.filer)
-
 	grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.msg_broker")
-	cipher := false
-
-	for {
-		err := pb.WithGrpcFilerClient(false, filerAddress, grpcDialOption, func(client filer_pb.SeaweedFilerClient) error {
-			resp, err := client.GetFilerConfiguration(context.Background(), &filer_pb.GetFilerConfigurationRequest{})
-			if err != nil {
-				return fmt.Errorf("get filer %s configuration: %v", filerAddress, err)
-			}
-			cipher = resp.Cipher
-			return nil
-		})
-		if err != nil {
-			glog.V(0).Infof("wait to connect to filer %s grpc address %s", *mqBrokerOpt.filer, filerAddress.ToGrpcAddress())
-			time.Sleep(time.Second)
-		} else {
-			glog.V(0).Infof("connected to filer %s grpc address %s", *mqBrokerOpt.filer, filerAddress.ToGrpcAddress())
-			break
-		}
-	}
 
 	qs, err := broker.NewMessageBroker(&broker.MessageQueueBrokerOption{
 		Masters:            mqBrokerOpt.masters,
 		FilerGroup:         *mqBrokerOpt.filerGroup,
 		DataCenter:         *mqBrokerOpt.dataCenter,
 		Rack:               *mqBrokerOpt.rack,
-		Filers:             []pb.ServerAddress{filerAddress},
 		DefaultReplication: "",
 		MaxMB:              0,
 		Ip:                 *mqBrokerOpt.ip,
 		Port:               *mqBrokerOpt.port,
-		Cipher:             cipher,
 	}, grpcDialOption)
 
 	// start grpc listener
diff --git a/weed/command/server.go b/weed/command/server.go
index 04b07ed51..b993d9428 100644
--- a/weed/command/server.go
+++ b/weed/command/server.go
@@ -228,7 +228,6 @@ func runServer(cmd *Command, args []string) bool {
 	s3Options.filer = &filerAddress
 	iamOptions.filer = &filerAddress
 	webdavOptions.filer = &filerAddress
-	mqBrokerOptions.filer = &filerAddress
 	mqBrokerOptions.filerGroup = filerOptions.filerGroup
 
 	go stats_collect.StartMetricsServer(*serverMetricsHttpPort)