diff options
| author | Chris Lu <chris.lu@gmail.com> | 2014-02-14 17:10:49 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2014-02-14 17:10:49 -0800 |
| commit | edae676913363bdd1e5a50bf0778fdcc3c6d6051 (patch) | |
| tree | 8711d0e0382ba15b2810e7783cdede4283d7e1c4 /go/weed/master.go | |
| parent | ef4c2c0d1e5bb45a63cde703013871daa401d1ef (diff) | |
| download | seaweedfs-edae676913363bdd1e5a50bf0778fdcc3c6d6051.tar.xz seaweedfs-edae676913363bdd1e5a50bf0778fdcc3c6d6051.zip | |
1. volume server auto detect clustered master nodes
2. remove operation package dependency on storage
Diffstat (limited to 'go/weed/master.go')
| -rw-r--r-- | go/weed/master.go | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/go/weed/master.go b/go/weed/master.go index 146974166..97def1948 100644 --- a/go/weed/master.go +++ b/go/weed/master.go @@ -28,8 +28,9 @@ var cmdMaster = &Command{ var ( mport = cmdMaster.Flag.Int("port", 9333, "http listen port") - mip = cmdMaster.Flag.String("ip", "localhost", "http listen port") + masterIp = cmdMaster.Flag.String("ip", "", "master ip address") metaFolder = cmdMaster.Flag.String("mdir", os.TempDir(), "data directory to store meta data") + masterPeers = cmdMaster.Flag.String("peers", "", "other master nodes in comma separated ip:port list") volumeSizeLimitMB = cmdMaster.Flag.Uint("volumeSizeLimitMB", 32*1000, "Default Volume Size in MegaBytes") mpulse = cmdMaster.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats") confFile = cmdMaster.Flag.String("conf", "/etc/weedfs/weedfs.conf", "xml configuration file") @@ -55,16 +56,28 @@ func runMaster(cmd *Command, args []string) bool { } r := mux.NewRouter() - weed_server.NewMasterServer(r, VERSION, *mport, *metaFolder, + ms := weed_server.NewMasterServer(r, VERSION, *mport, *metaFolder, *volumeSizeLimitMB, *mpulse, *confFile, *defaultRepType, *garbageThreshold, masterWhiteList, ) - glog.V(0).Infoln("Start Weed Master", VERSION, "at port", *mip+":"+strconv.Itoa(*mport)) + glog.V(0).Infoln("Start Weed Master", VERSION, "at port", *masterIp+":"+strconv.Itoa(*mport)) + srv := &http.Server{ - Addr: *mip + ":" + strconv.Itoa(*mport), + Addr: *masterIp + ":" + strconv.Itoa(*mport), Handler: r, ReadTimeout: time.Duration(*mReadTimeout) * time.Second, } + + go func() { + time.Sleep(100 * time.Millisecond) + var peers []string + if *masterPeers != "" { + peers = strings.Split(*masterPeers, ",") + } + raftServer := weed_server.NewRaftServer(r, VERSION, peers, *masterIp+":"+strconv.Itoa(*mport), *metaFolder) + ms.SetRaftServer(raftServer) + }() + e := srv.ListenAndServe() if e != nil { glog.Fatalf("Fail to start:%s", e) |