change to 3-digit replication types

3 files changed, 12 insertions, 6 deletions

diff --git a/weed-fs/src/cmd/weed/master.go b/weed-fs/src/cmd/weed/master.go
index 7751a4819..a87c8f312 100644
--- a/weed-fs/src/cmd/weed/master.go
+++ b/weed-fs/src/cmd/weed/master.go
@@ -33,7 +33,7 @@ var (
 	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", "/etc/weedfs/weedfs.conf", "xml configuration file")
-	defaultRepType    = cmdMaster.Flag.String("defaultReplicationType", "00", "Default replication type if not specified.")
+	defaultRepType    = cmdMaster.Flag.String("defaultReplicationType", "000", "Default replication type if not specified.")
 	mReadTimeout      = cmdMaster.Flag.Int("readTimeout", 5, "connection read timeout in seconds")
 )
 
@@ -70,7 +70,7 @@ func dirAssignHandler(w http.ResponseWriter, r *http.Request) {
 	if repType == "" {
 		repType = *defaultRepType
 	}
-	rt, err := storage.NewReplicationType(repType)
+	rt, err := storage.NewReplicationTypeFromString(repType)
 	if err != nil {
 		writeJson(w, r, map[string]string{"error": err.Error()})
 		return
@@ -107,12 +107,15 @@ func dirJoinHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func dirStatusHandler(w http.ResponseWriter, r *http.Request) {
-	writeJson(w, r, topo.ToMap())
+  m := make(map[string]interface{})
+  m["Version"] = VERSION
+  m["Topology"] = topo.ToMap()
+	writeJson(w, r, m)
 }
 
 func volumeGrowHandler(w http.ResponseWriter, r *http.Request) {
 	count := 0
-	rt, err := storage.NewReplicationType(r.FormValue("replication"))
+	rt, err := storage.NewReplicationTypeFromString(r.FormValue("replication"))
 	if err == nil {
 		if count, err = strconv.Atoi(r.FormValue("count")); err == nil {
 			if topo.FreeSpace() < count*rt.GetCopyCount() {
diff --git a/weed-fs/src/cmd/weed/upload.go b/weed-fs/src/cmd/weed/upload.go
index 882459c05..e25930b5d 100644
--- a/weed-fs/src/cmd/weed/upload.go
+++ b/weed-fs/src/cmd/weed/upload.go
@@ -17,7 +17,7 @@ func init() {
 	cmdUpload.Run = runUpload // break init cycle
 	IsDebug = cmdUpload.Flag.Bool("debug", false, "verbose debug information")
 	server = cmdUpload.Flag.String("server", "localhost:9333", "weedfs master location")
-	uploadReplication = cmdUpload.Flag.String("replication", "00", "replication type(00,01,10,11)")
+	uploadReplication = cmdUpload.Flag.String("replication", "000", "replication type(000,001,010,100,110,200)")
 }
 
 var cmdUpload = &Command{
diff --git a/weed-fs/src/cmd/weed/volume.go b/weed-fs/src/cmd/weed/volume.go
index a9ab85c98..38946396e 100644
--- a/weed-fs/src/cmd/weed/volume.go
+++ b/weed-fs/src/cmd/weed/volume.go
@@ -41,7 +41,10 @@ var (
 )
 
 func statusHandler(w http.ResponseWriter, r *http.Request) {
-	writeJson(w, r, store.Status())
+  m := make(map[string]interface{})
+  m["Version"] = VERSION
+  m["Volumes"] = store.Status()
+  writeJson(w, r, m)
 }
 func assignVolumeHandler(w http.ResponseWriter, r *http.Request) {
 	err := store.AddVolume(r.FormValue("volume"), r.FormValue("replicationType"))