mirrors/seaweedfs
1
0
Fork 0
mirror of https://github.com/chrislusf/seaweedfs synced 2024-06-17 08:00:28 +02:00
Code Issues Projects Releases Wiki Activity

fix filer address parsing (#5415)

Browse source
This commit is contained in:
Nikita Korolev 2024-03-24 21:20:33 +03:00 committed by GitHub
parent 1f3742850d
commit 2dd2bb3e16
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
weed/command/shell.go
View file

@ -19,7 +19,7 @@ func init() {
cmdShell.Run = runShell // break init cycle cmdShell.Run = runShell // break init cycle
shellOptions.Masters = cmdShell.Flag.String("master", "", "comma-separated master servers, e.g. localhost:9333") shellOptions.Masters = cmdShell.Flag.String("master", "", "comma-separated master servers, e.g. localhost:9333")
shellOptions.FilerGroup = cmdShell.Flag.String("filerGroup", "", "filerGroup for the filers") shellOptions.FilerGroup = cmdShell.Flag.String("filerGroup", "", "filerGroup for the filers")
shellInitialFiler = cmdShell.Flag.String("filer", "", "filer host and port, e.g. localhost:8888") shellInitialFiler = cmdShell.Flag.String("filer", "", "filer host and port for initial connection, e.g. localhost:8888")
shellCluster = cmdShell.Flag.String("cluster", "", "cluster defined in shell.toml") shellCluster = cmdShell.Flag.String("cluster", "", "cluster defined in shell.toml")
} }
@ -37,25 +37,29 @@ func runShell(command *Command, args []string) bool {
util.LoadConfiguration("security", false) util.LoadConfiguration("security", false)
shellOptions.GrpcDialOption = security.LoadClientTLS(util.GetViper(), "grpc.client") shellOptions.GrpcDialOption = security.LoadClientTLS(util.GetViper(), "grpc.client")
shellOptions.Directory = "/"
if *shellOptions.Masters == "" {
util.LoadConfiguration("shell", false) util.LoadConfiguration("shell", false)
v := util.GetViper() viper := util.GetViper()
cluster := v.GetString("cluster.default") cluster := viper.GetString("cluster.default")
if *shellCluster != "" { if *shellCluster != "" {
cluster = *shellCluster cluster = *shellCluster
} }
if *shellOptions.Masters == "" {
if cluster == "" { if cluster == "" {
*shellOptions.Masters = "localhost:9333" *shellOptions.Masters = "localhost:9333"
} else { } else {
*shellOptions.Masters = v.GetString("cluster." + cluster + ".master") *shellOptions.Masters = viper.GetString("cluster." + cluster + ".master")
*shellInitialFiler = v.GetString("cluster." + cluster + ".filer")
fmt.Printf("master: %s filer: %s\n", *shellOptions.Masters, *shellInitialFiler)
} }
} }
shellOptions.FilerAddress = pb.ServerAddress(*shellInitialFiler) filerAddress := *shellInitialFiler
shellOptions.Directory = "/" if filerAddress == "" && cluster != "" {
filerAddress = viper.GetString("cluster." + cluster + ".filer")
}
shellOptions.FilerAddress = pb.ServerAddress(filerAddress)
fmt.Printf("master: %s filer: %s\n", *shellOptions.Masters, shellOptions.FilerAddress)
shell.RunShell(shellOptions) shell.RunShell(shellOptions)