diff options
| author | Chris Lu <chris.lu@gmail.com> | 2017-02-12 21:58:44 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2017-02-12 21:58:44 -0800 |
| commit | 41f686ab9d8aaa94dc6e8c6746ecd7f63bc98506 (patch) | |
| tree | 92ea9772e8e0169a1a97af78a04de9f39eb29c13 /weed/server/master_server.go | |
| parent | 98d66a569b0b1ee1ef0b58fbf3bd0fa2fc917f5d (diff) | |
| download | seaweedfs-41f686ab9d8aaa94dc6e8c6746ecd7f63bc98506.tar.xz seaweedfs-41f686ab9d8aaa94dc6e8c6746ecd7f63bc98506.zip | |
remove weeds.conf
Diffstat (limited to 'weed/server/master_server.go')
| -rw-r--r-- | weed/server/master_server.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/weed/server/master_server.go b/weed/server/master_server.go index f02cb2790..360c6bb46 100644 --- a/weed/server/master_server.go +++ b/weed/server/master_server.go @@ -37,7 +37,6 @@ func NewMasterServer(r *mux.Router, port int, metaFolder string, volumeSizeLimitMB uint, preallocate bool, pulseSeconds int, - confFile string, defaultReplicaPlacement string, garbageThreshold string, whiteList []string, @@ -58,11 +57,7 @@ func NewMasterServer(r *mux.Router, port int, metaFolder string, } ms.bounedLeaderChan = make(chan int, 16) seq := sequence.NewMemorySequencer() - var e error - if ms.Topo, e = topology.NewTopology("topo", confFile, seq, - uint64(volumeSizeLimitMB)*1024*1024, pulseSeconds); e != nil { - glog.Fatalf("cannot create topology:%s", e) - } + ms.Topo = topology.NewTopology("topo", seq, uint64(volumeSizeLimitMB)*1024*1024, pulseSeconds) ms.vg = topology.NewDefaultVolumeGrowth() glog.V(0).Infoln("Volume Size Limit is", volumeSizeLimitMB, "MB") |