From ab49540d2ba0f8c38324247360edd08bb9355b9b Mon Sep 17 00:00:00 2001 From: chrislu Date: Wed, 25 Jun 2025 17:54:56 -0700 Subject: [PATCH] use master.toml value if not empty fix https://github.com/seaweedfs/seaweedfs/issues/6922 --- weed/command/master.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/weed/command/master.go b/weed/command/master.go index c7b979e05..a8cdf76c6 100644 --- a/weed/command/master.go +++ b/weed/command/master.go @@ -3,13 +3,14 @@ package command import ( "context" "fmt" - "github.com/seaweedfs/seaweedfs/weed/util/version" "net/http" "os" "path" "strings" "time" + "github.com/seaweedfs/seaweedfs/weed/util/version" + hashicorpRaft "github.com/hashicorp/raft" "slices" @@ -111,6 +112,11 @@ func runMaster(cmd *Command, args []string) bool { util.LoadSecurityConfiguration() util.LoadConfiguration("master", false) + // bind viper configuration to command line flags + if v := util.GetViper().GetString("master.mdir"); v != "" { + *m.metaFolder = v + } + grace.SetupProfiling(*masterCpuProfile, *masterMemProfile) parent, _ := util.FullPath(*m.metaFolder).DirAndName()