From 4ee766e966aba41cd6d60b5449b080ee0922693c Mon Sep 17 00:00:00 2001 From: chrislusf Date: Wed, 25 Feb 2015 21:26:45 -0800 Subject: [PATCH 1/4] avoid auto unzip tar.gz files fix https://github.com/chrislusf/weed-fs/issues/90 --- go/storage/needle.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) From b2f636ab8c6012c2b5b63feade4438110357e5e2 Mon Sep 17 00:00:00 2001 From: chrislusf Date: Wed, 25 Feb 2015 21:28:55 -0800 Subject: [PATCH 2/4] set default volume admin port --- go/weed/server.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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() { From 1704e5f1a662a1bb631193901f8d76f174b4ce8d Mon Sep 17 00:00:00 2001 From: chrislusf Date: Wed, 25 Feb 2015 21:29:12 -0800 Subject: [PATCH 3/4] adjust debug message --- go/topology/volume_growth.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) } } From a091e6f3bcea9a51c41cc0b7c44b0b060630939e Mon Sep 17 00:00:00 2001 From: chrislusf Date: Wed, 25 Feb 2015 21:29:38 -0800 Subject: [PATCH 4/4] display admin url on /dir/status --- go/topology/data_node.go | 1 + 1 file changed, 1 insertion(+) 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 }