From 41f686ab9d8aaa94dc6e8c6746ecd7f63bc98506 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sun, 12 Feb 2017 21:58:44 -0800 Subject: [PATCH] remove weeds.conf --- weed/command/master.go | 3 +-- weed/command/server.go | 3 +-- weed/server/master_server.go | 7 +------ weed/topology/configuration.go | 14 -------------- weed/topology/topology.go | 17 +++-------------- 5 files changed, 6 insertions(+), 38 deletions(-) diff --git a/weed/command/master.go b/weed/command/master.go index aed92fa33..09089a4f9 100644 --- a/weed/command/master.go +++ b/weed/command/master.go @@ -41,7 +41,6 @@ var ( volumeSizeLimitMB = cmdMaster.Flag.Uint("volumeSizeLimitMB", 30*1000, "Master stops directing writes to oversized volumes.") volumePreallocate = cmdMaster.Flag.Bool("volumePreallocate", false, "Preallocate disk space for volumes.") mpulse = cmdMaster.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats") - confFile = cmdMaster.Flag.String("conf", "/etc/weedfs/weedfs.conf", "Deprecating! xml configuration file") defaultReplicaPlacement = cmdMaster.Flag.String("defaultReplication", "000", "Default replication type if not specified.") // mTimeout = cmdMaster.Flag.Int("idleTimeout", 30, "connection idle seconds") mMaxCpu = cmdMaster.Flag.Int("maxCpu", 0, "maximum number of CPUs. 0 means all available CPUs") @@ -79,7 +78,7 @@ func runMaster(cmd *Command, args []string) bool { r := mux.NewRouter() ms := weed_server.NewMasterServer(r, *mport, *metaFolder, *volumeSizeLimitMB, *volumePreallocate, - *mpulse, *confFile, *defaultReplicaPlacement, *garbageThreshold, + *mpulse, *defaultReplicaPlacement, *garbageThreshold, masterWhiteList, *masterSecureKey, ) diff --git a/weed/command/server.go b/weed/command/server.go index b4b98ba1e..e1152f23f 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -66,7 +66,6 @@ var ( masterMetaFolder = cmdServer.Flag.String("master.dir", "", "data directory to store meta data, default to same as -dir specified") masterVolumeSizeLimitMB = cmdServer.Flag.Uint("master.volumeSizeLimitMB", 30*1000, "Master stops directing writes to oversized volumes.") masterVolumePreallocate = cmdServer.Flag.Bool("master.volumePreallocate", false, "Preallocate disk space for volumes.") - masterConfFile = cmdServer.Flag.String("master.conf", "/etc/weedfs/weedfs.conf", "xml configuration file") masterDefaultReplicaPlacement = cmdServer.Flag.String("master.defaultReplicaPlacement", "000", "Default replication type if not specified.") volumePort = cmdServer.Flag.Int("volume.port", 8080, "volume server http listen port") volumePublicPort = cmdServer.Flag.Int("volume.port.public", 0, "volume server public port") @@ -210,7 +209,7 @@ func runServer(cmd *Command, args []string) bool { r := mux.NewRouter() ms := weed_server.NewMasterServer(r, *masterPort, *masterMetaFolder, *masterVolumeSizeLimitMB, *masterVolumePreallocate, - *volumePulse, *masterConfFile, *masterDefaultReplicaPlacement, *serverGarbageThreshold, + *volumePulse, *masterDefaultReplicaPlacement, *serverGarbageThreshold, serverWhiteList, *serverSecureKey, ) 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") diff --git a/weed/topology/configuration.go b/weed/topology/configuration.go index ffcebb59c..2a544ce1d 100644 --- a/weed/topology/configuration.go +++ b/weed/topology/configuration.go @@ -25,20 +25,6 @@ type Configuration struct { ip2location map[string]loc } -func NewConfiguration(b []byte) (*Configuration, error) { - c := &Configuration{} - err := xml.Unmarshal(b, c) - c.ip2location = make(map[string]loc) - for _, dc := range c.Topo.DataCenters { - for _, rack := range dc.Racks { - for _, ip := range rack.Ips { - c.ip2location[ip] = loc{dcName: dc.Name, rackName: rack.Name} - } - } - } - return c, err -} - func (c *Configuration) String() string { if b, e := xml.MarshalIndent(c, " ", " "); e == nil { return string(b) diff --git a/weed/topology/topology.go b/weed/topology/topology.go index ffd32ae21..1c5633e95 100644 --- a/weed/topology/topology.go +++ b/weed/topology/topology.go @@ -2,7 +2,6 @@ package topology import ( "errors" - "io/ioutil" "math/rand" "github.com/chrislusf/raft" @@ -30,7 +29,7 @@ type Topology struct { RaftServer raft.Server } -func NewTopology(id string, confFile string, seq sequence.Sequencer, volumeSizeLimit uint64, pulse int) (*Topology, error) { +func NewTopology(id string, seq sequence.Sequencer, volumeSizeLimit uint64, pulse int) *Topology { t := &Topology{} t.id = NodeId(id) t.nodeType = "Topology" @@ -44,9 +43,9 @@ func NewTopology(id string, confFile string, seq sequence.Sequencer, volumeSizeL t.chanFullVolumes = make(chan storage.VolumeInfo) - err := t.loadConfiguration(confFile) + t.Configuration = &Configuration{} - return t, err + return t } func (t *Topology) IsLeader() bool { @@ -72,16 +71,6 @@ func (t *Topology) Leader() (string, error) { return l, nil } -func (t *Topology) loadConfiguration(configurationFile string) error { - b, e := ioutil.ReadFile(configurationFile) - if e == nil { - t.Configuration, e = NewConfiguration(b) - return e - } - glog.V(0).Infoln("Using default configurations.") - return nil -} - func (t *Topology) Lookup(collection string, vid storage.VolumeId) []*DataNode { //maybe an issue if lots of collections? if collection == "" {