diff options
Diffstat (limited to 'weed/command')
| -rw-r--r-- | weed/command/command.go | 4 | ||||
| -rw-r--r-- | weed/command/mq_broker.go | 8 | ||||
| -rw-r--r-- | weed/command/server.go | 1 |
3 files changed, 10 insertions, 3 deletions
diff --git a/weed/command/command.go b/weed/command/command.go index abd1b63e9..512cd6f8f 100644 --- a/weed/command/command.go +++ b/weed/command/command.go @@ -28,12 +28,12 @@ var Commands = []*Command{ cmdFilerSynchronize, cmdFix, cmdFuse, + cmdIam, cmdMaster, cmdMasterFollower, cmdMount, - cmdS3, - cmdIam, cmdMqBroker, + cmdS3, cmdScaffold, cmdServer, cmdShell, diff --git a/weed/command/mq_broker.go b/weed/command/mq_broker.go index da7f59596..c87cccd2c 100644 --- a/weed/command/mq_broker.go +++ b/weed/command/mq_broker.go @@ -23,6 +23,8 @@ var ( ) type MessageQueueBrokerOptions struct { + masters *string + filerGroup *string filer *string ip *string port *int @@ -32,7 +34,9 @@ type MessageQueueBrokerOptions struct { func init() { cmdMqBroker.Run = runMqBroker // break init cycle + mqBrokerStandaloneOptions.masters = 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") mqBrokerStandaloneOptions.cpuprofile = cmdMqBroker.Flag.String("cpuprofile", "", "cpu profile output file") @@ -85,7 +89,9 @@ func (mqBrokerOpt *MessageQueueBrokerOptions) startQueueServer() bool { } } - qs, err := broker.NewMessageBroker(&broker.MessageBrokerOption{ + qs, err := broker.NewMessageBroker(&broker.MessageQueueBrokerOption{ + Masters: pb.ServerAddresses(*mqBrokerOpt.masters).ToAddressMap(), + FilerGroup: *mqBrokerOpt.filerGroup, Filers: []pb.ServerAddress{filerAddress}, DefaultReplication: "", MaxMB: 0, diff --git a/weed/command/server.go b/weed/command/server.go index 7c14fd14f..2c363087c 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -225,6 +225,7 @@ func runServer(cmd *Command, args []string) bool { iamOptions.filer = &filerAddress webdavOptions.filer = &filerAddress mqBrokerOptions.filer = &filerAddress + mqBrokerOptions.filerGroup = filerOptions.filerGroup go stats_collect.StartMetricsServer(*serverMetricsHttpPort) |