Merge branch 'master' of github.com:chrislusf/weed-fs

4 files changed, 11 insertions, 6 deletions

diff --git a/go/storage/needle.go b/go/storage/needle.go
index e4994da3f..85806f3cb 100644
--- a/go/storage/needle.go
+++ b/go/storage/needle.go
@@ -126,7 +126,8 @@ func ParseUpload(r *http.Request) (fileName string, data []byte, mimeType string
 	if ext == ".gz" {
 		isGzipped = true
 	}
-	if strings.HasSuffix(fileName, ".gz") {
+	if strings.HasSuffix(fileName, ".gz") &&
+		!strings.HasSuffix(fileName, ".tar.gz") {
 		fileName = fileName[:len(fileName)-3]
 	}
 	modifiedTime, _ = strconv.ParseUint(r.FormValue("ts"), 10, 64)
diff --git a/go/topology/data_node.go b/go/topology/data_node.go
index 2d0a093cc..e0d12cbcc 100644
--- a/go/topology/data_node.go
+++ b/go/topology/data_node.go
@@ -101,5 +101,6 @@ func (dn *DataNode) ToMap() interface{} {
 	ret["Max"] = dn.GetMaxVolumeCount()
 	ret["Free"] = dn.FreeSpace()
 	ret["PublicUrl"] = dn.PublicUrl
+	ret["AdminUrl"] = dn.AdminUrl()
 	return ret
 }
diff --git a/go/topology/volume_growth.go b/go/topology/volume_growth.go
index 9de0eb19f..7f5fca8ca 100644
--- a/go/topology/volume_growth.go
+++ b/go/topology/volume_growth.go
@@ -203,7 +203,7 @@ func (vg *VolumeGrowth) grow(topo *Topology, vid storage.VolumeId, option *Volum
 			topo.RegisterVolumeLayout(vi, server)
 			glog.V(0).Infoln("Created Volume", vid, "on", server.NodeImpl.String())
 		} else {
-			glog.V(0).Infoln("Failed to assign", vid, "to", servers, "error", err)
+			glog.V(0).Infoln("Failed to assign volume", vid, "to", servers, "error", err)
 			return fmt.Errorf("Failed to assign %d: %v", vid, err)
 		}
 	}
diff --git a/go/weed/server.go b/go/weed/server.go
index a758f887f..dd05d035a 100644
--- a/go/weed/server.go
+++ b/go/weed/server.go
@@ -109,6 +109,10 @@ func runServer(cmd *Command, args []string) bool {
 		*filerOptions.defaultReplicaPlacement = *masterDefaultReplicaPlacement
 	}
 
+	if *volumeAdminPort == 0 {
+		*volumeAdminPort = *volumePort
+	}
+
 	if *serverMaxCpu < 1 {
 		*serverMaxCpu = runtime.NumCPU()
 	}
@@ -172,7 +176,6 @@ func runServer(cmd *Command, args []string) bool {
 			)
 			if e != nil {
 				glog.Fatalf("Filer listener error: %v", e)
-				glog.Fatalf(e.Error())
 			}
 			if e := http.Serve(filerListener, r); e != nil {
 				glog.Fatalf("Filer Fail to serve: %v", e)
@@ -229,12 +232,12 @@ func runServer(cmd *Command, args []string) bool {
 	)
 
 	glog.V(0).Infoln("Start Seaweed volume server", util.VERSION, "at", *serverIp+":"+strconv.Itoa(*volumePort))
-	volumeListener, e := util.NewListener(
+	volumeListener, eListen := util.NewListener(
 		*serverBindIp+":"+strconv.Itoa(*volumePort),
 		time.Duration(*serverTimeout)*time.Second,
 	)
-	if e != nil {
-		glog.Fatalf("Volume server listener error: %v", e)
+	if eListen != nil {
+		glog.Fatalf("Volume server listener error: %v", eListen)
 	}
 
 	OnInterrupt(func() {