diff options
| author | Chris Lu <chris.lu@gmail.com> | 2012-12-03 22:54:08 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2012-12-03 22:54:08 -0800 |
| commit | 6201ed537ef11f91c24c14612f1d087796e2d5f8 (patch) | |
| tree | a6914928abba0707c80e14953b94dc8c36683947 /weed-fs/src/cmd | |
| parent | b3df7673edbe369b964ee749da2c6d1e110b2f35 (diff) | |
| download | seaweedfs-6201ed537ef11f91c24c14612f1d087796e2d5f8.tar.xz seaweedfs-6201ed537ef11f91c24c14612f1d087796e2d5f8.zip | |
reporting volume size as early as possible
Diffstat (limited to 'weed-fs/src/cmd')
| -rw-r--r-- | weed-fs/src/cmd/weed/master.go | 3 | ||||
| -rw-r--r-- | weed-fs/src/cmd/weed/volume.go | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/weed-fs/src/cmd/weed/master.go b/weed-fs/src/cmd/weed/master.go index 92d96718a..a70f8273e 100644 --- a/weed-fs/src/cmd/weed/master.go +++ b/weed-fs/src/cmd/weed/master.go @@ -114,6 +114,9 @@ func dirJoinHandler(w http.ResponseWriter, r *http.Request) { json.Unmarshal([]byte(r.FormValue("volumes")), volumes) debug(s, "volumes", r.FormValue("volumes")) topo.RegisterVolumes(*volumes, ip, port, publicUrl, maxVolumeCount) + m := make(map[string]interface{}) + m["VolumeSizeLimit"] = uint64(*volumeSizeLimitMB)*1024*1024 + writeJson(w, r, m) } func dirStatusHandler(w http.ResponseWriter, r *http.Request) { diff --git a/weed-fs/src/cmd/weed/volume.go b/weed-fs/src/cmd/weed/volume.go index 88841273a..f12f9f4e0 100644 --- a/weed-fs/src/cmd/weed/volume.go +++ b/weed-fs/src/cmd/weed/volume.go @@ -317,8 +317,9 @@ func runVolume(cmd *Command, args []string) bool { go func() { connected := true + store.SetMaster(*masterNode) for { - err := store.Join(*masterNode) + err := store.Join() if err == nil { if !connected { connected = true |