diff options
| author | Chris Lu <chris.lu@gmail.com> | 2012-09-22 20:46:31 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2012-09-22 20:46:31 -0700 |
| commit | 73dbb3aed9506bd21904f22ac5ec4de7ef53d830 (patch) | |
| tree | 0b68a1120c332a3b3783474b92f29bac99f39659 /weed-fs/src/cmd | |
| parent | a34570fc5ba32535b311049f53e4e2f8a7648857 (diff) | |
| download | seaweedfs-73dbb3aed9506bd21904f22ac5ec4de7ef53d830.tar.xz seaweedfs-73dbb3aed9506bd21904f22ac5ec4de7ef53d830.zip | |
load configuration file, with topology configured
Diffstat (limited to 'weed-fs/src/cmd')
| -rw-r--r-- | weed-fs/src/cmd/weed/master.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/weed-fs/src/cmd/weed/master.go b/weed-fs/src/cmd/weed/master.go index bd2323d2a..0c0cf06a5 100644 --- a/weed-fs/src/cmd/weed/master.go +++ b/weed-fs/src/cmd/weed/master.go @@ -34,6 +34,7 @@ var ( capacity = cmdMaster.Flag.Int("capacity", 100, "maximum number of volumes to hold") volumeSizeLimitMB = cmdMaster.Flag.Uint("volumeSizeLimitMB", 32*1024, "Default Volume Size in MegaBytes") mpulse = cmdMaster.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats") + confFile = cmdMaster.Flag.String("conf", "./weed.xml", "configuration file") ) var mapper *directory.Mapper @@ -53,7 +54,7 @@ func dirLookupHandler(w http.ResponseWriter, r *http.Request) { for _, machine := range machines { ret = append(ret, map[string]string{"url": machine.Url, "publicUrl": machine.PublicUrl}) } - writeJson(w, r, map[string]interface{}{"locations":ret}) + writeJson(w, r, map[string]interface{}{"locations": ret}) } else { log.Println("Invalid volume id", volumeId) writeJson(w, r, map[string]string{"error": "volume id " + volumeId.String() + " not found. " + e.Error()}) @@ -131,7 +132,7 @@ func volumeGrowHandler(w http.ResponseWriter, r *http.Request) { } func runMaster(cmd *Command, args []string) bool { - topo = topology.NewTopology("topo", *metaFolder, "toposequence", uint64(*volumeSizeLimitMB)*1024*1024, *mpulse) + topo = topology.NewTopology("topo", *confFile, *metaFolder, "toposequence", uint64(*volumeSizeLimitMB)*1024*1024, *mpulse) vg = replication.NewDefaultVolumeGrowth() log.Println("Volume Size Limit is", *volumeSizeLimitMB, "MB") mapper = directory.NewMapper(*metaFolder, "directory", uint64(*volumeSizeLimitMB)*1024*1024, *mpulse) |