diff options
| author | Chris Lu <chris.lu@gmail.com> | 2019-11-28 18:33:18 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2019-11-28 18:33:18 -0800 |
| commit | f60154f330a81354c433da37d612f235d1c0e4e9 (patch) | |
| tree | 5e473f9616e35e525468959496e0448fb505e20a /weed/command/master.go | |
| parent | 641b92f53c057a2d0dd957ef2da26aadf0b70419 (diff) | |
| download | seaweedfs-f60154f330a81354c433da37d612f235d1c0e4e9.tar.xz seaweedfs-f60154f330a81354c433da37d612f235d1c0e4e9.zip | |
master load backend storage config from master.toml
Diffstat (limited to 'weed/command/master.go')
| -rw-r--r-- | weed/command/master.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/weed/command/master.go b/weed/command/master.go index 3d33f4f7a..8d0a3289c 100644 --- a/weed/command/master.go +++ b/weed/command/master.go @@ -12,6 +12,7 @@ import ( "github.com/chrislusf/seaweedfs/weed/pb/master_pb" "github.com/chrislusf/seaweedfs/weed/security" "github.com/chrislusf/seaweedfs/weed/server" + "github.com/chrislusf/seaweedfs/weed/storage/backend" "github.com/chrislusf/seaweedfs/weed/util" "github.com/gorilla/mux" "github.com/spf13/viper" @@ -101,6 +102,8 @@ func runMaster(cmd *Command, args []string) bool { func startMaster(masterOption MasterOptions, masterWhiteList []string) { + backend.LoadConfiguration(viper.GetViper()) + myMasterAddress, peers := checkPeers(*masterOption.ip, *masterOption.port, *masterOption.peers) r := mux.NewRouter() |