1. adding statistics reporting

2. refactor version to util package

11 files changed, 54 insertions, 28 deletions

diff --git a/go/weed/benchmark.go b/go/weed/benchmark.go
index ae89ea664..eab923751 100644
--- a/go/weed/benchmark.go
+++ b/go/weed/benchmark.go
@@ -98,7 +98,7 @@ func init() {
 }
 
 func runbenchmark(cmd *Command, args []string) bool {
-	fmt.Printf("This is Weed File System version %s %s %s\n", VERSION, runtime.GOOS, runtime.GOARCH)
+	fmt.Printf("This is Weed File System version %s %s %s\n", util.VERSION, runtime.GOOS, runtime.GOARCH)
 	if *b.cpuprofile != "" {
 		f, err := os.Create(*b.cpuprofile)
 		if err != nil {
diff --git a/go/weed/master.go b/go/weed/master.go
index 2d003185f..1efa0e79c 100644
--- a/go/weed/master.go
+++ b/go/weed/master.go
@@ -56,11 +56,11 @@ func runMaster(cmd *Command, args []string) bool {
 	}
 
 	r := mux.NewRouter()
-	ms := weed_server.NewMasterServer(r, VERSION, *mport, *metaFolder,
+	ms := weed_server.NewMasterServer(r, *mport, *metaFolder,
 		*volumeSizeLimitMB, *mpulse, *confFile, *defaultReplicaPlacement, *garbageThreshold, masterWhiteList,
 	)
 
-	glog.V(0).Infoln("Start Weed Master", VERSION, "at port", *masterIp+":"+strconv.Itoa(*mport))
+	glog.V(0).Infoln("Start Weed Master", util.VERSION, "at port", *masterIp+":"+strconv.Itoa(*mport))
 
 	listener, e := util.NewListener(
 		*masterIp+":"+strconv.Itoa(*mport),
@@ -76,7 +76,7 @@ func runMaster(cmd *Command, args []string) bool {
 		if *masterPeers != "" {
 			peers = strings.Split(*masterPeers, ",")
 		}
-		raftServer := weed_server.NewRaftServer(r, VERSION, peers, *masterIp+":"+strconv.Itoa(*mport), *metaFolder, ms.Topo, *mpulse)
+		raftServer := weed_server.NewRaftServer(r, peers, *masterIp+":"+strconv.Itoa(*mport), *metaFolder, ms.Topo, *mpulse)
 		ms.SetRaftServer(raftServer)
 	}()
 
diff --git a/go/weed/server.go b/go/weed/server.go
index bb2f2b447..37ce13849 100644
--- a/go/weed/server.go
+++ b/go/weed/server.go
@@ -104,11 +104,11 @@ func runServer(cmd *Command, args []string) bool {
 
 	go func() {
 		r := mux.NewRouter()
-		ms := weed_server.NewMasterServer(r, VERSION, *masterPort, *masterMetaFolder,
+		ms := weed_server.NewMasterServer(r, *masterPort, *masterMetaFolder,
 			*masterVolumeSizeLimitMB, *volumePulse, *masterConfFile, *masterDefaultReplicaPlacement, *garbageThreshold, serverWhiteList,
 		)
 
-		glog.V(0).Infoln("Start Weed Master", VERSION, "at port", *serverIp+":"+strconv.Itoa(*masterPort))
+		glog.V(0).Infoln("Start Weed Master", util.VERSION, "at port", *serverIp+":"+strconv.Itoa(*masterPort))
 		masterListener, e := util.NewListener(
 			*serverIp+":"+strconv.Itoa(*masterPort),
 			time.Duration(*serverTimeout)*time.Second,
@@ -124,7 +124,7 @@ func runServer(cmd *Command, args []string) bool {
 			if *serverPeers != "" {
 				peers = strings.Split(*serverPeers, ",")
 			}
-			raftServer := weed_server.NewRaftServer(r, VERSION, peers, *serverIp+":"+strconv.Itoa(*masterPort), *masterMetaFolder, ms.Topo, *volumePulse)
+			raftServer := weed_server.NewRaftServer(r, peers, *serverIp+":"+strconv.Itoa(*masterPort), *masterMetaFolder, ms.Topo, *volumePulse)
 			ms.SetRaftServer(raftServer)
 			volumeWait.Done()
 		}()
@@ -138,11 +138,11 @@ func runServer(cmd *Command, args []string) bool {
 	volumeWait.Wait()
 	time.Sleep(100 * time.Millisecond)
 	r := http.NewServeMux()
-	weed_server.NewVolumeServer(r, VERSION, *serverIp, *volumePort, *volumePublicUrl, folders, maxCounts,
+	weed_server.NewVolumeServer(r, *serverIp, *volumePort, *volumePublicUrl, folders, maxCounts,
 		*serverIp+":"+strconv.Itoa(*masterPort), *volumePulse, *serverDataCenter, *serverRack, serverWhiteList,
 	)
 
-	glog.V(0).Infoln("Start Weed volume server", VERSION, "at http://"+*serverIp+":"+strconv.Itoa(*volumePort))
+	glog.V(0).Infoln("Start Weed volume server", util.VERSION, "at http://"+*serverIp+":"+strconv.Itoa(*volumePort))
 	volumeListener, e := util.NewListener(
 		*serverIp+":"+strconv.Itoa(*volumePort),
 		time.Duration(*serverTimeout)*time.Second,
diff --git a/go/weed/version.go b/go/weed/version.go
index c6878fd3e..2e0a59822 100644
--- a/go/weed/version.go
+++ b/go/weed/version.go
@@ -1,14 +1,11 @@
 package main
 
 import (
+	"code.google.com/p/weed-fs/go/util"
 	"fmt"
 	"runtime"
 )
 
-const (
-	VERSION = "0.51"
-)
-
 var cmdVersion = &Command{
 	Run:       runVersion,
 	UsageLine: "version",
@@ -21,6 +18,6 @@ func runVersion(cmd *Command, args []string) bool {
 		cmd.Usage()
 	}
 
-	fmt.Printf("version %s %s %s\n", VERSION, runtime.GOOS, runtime.GOARCH)
+	fmt.Printf("version %s %s %s\n", util.VERSION, runtime.GOOS, runtime.GOARCH)
 	return true
 }
diff --git a/go/weed/volume.go b/go/weed/volume.go
index 85ee4618e..3c6cf05a5 100644
--- a/go/weed/volume.go
+++ b/go/weed/volume.go
@@ -74,11 +74,11 @@ func runVolume(cmd *Command, args []string) bool {
 
 	r := http.NewServeMux()
 
-	weed_server.NewVolumeServer(r, VERSION, *ip, *vport, *publicUrl, folders, maxCounts,
+	weed_server.NewVolumeServer(r, *ip, *vport, *publicUrl, folders, maxCounts,
 		*masterNode, *vpulse, *dataCenter, *rack, volumeWhiteList,
 	)
 
-	glog.V(0).Infoln("Start Weed volume server", VERSION, "at http://"+*ip+":"+strconv.Itoa(*vport))
+	glog.V(0).Infoln("Start Weed volume server", util.VERSION, "at http://"+*ip+":"+strconv.Itoa(*vport))
 	listener, e := util.NewListener(
 		*ip+":"+strconv.Itoa(*vport),
 		time.Duration(*vTimeout)*time.Second,
diff --git a/go/weed/weed_server/common.go b/go/weed/weed_server/common.go
index 204244791..cb7c001f3 100644
--- a/go/weed/weed_server/common.go
+++ b/go/weed/weed_server/common.go
@@ -4,7 +4,9 @@ import (
 	"bytes"
 	"code.google.com/p/weed-fs/go/glog"
 	"code.google.com/p/weed-fs/go/operation"
+	"code.google.com/p/weed-fs/go/stats"
 	"code.google.com/p/weed-fs/go/storage"
+	"code.google.com/p/weed-fs/go/util"
 	"encoding/json"
 	"fmt"
 	"net"
@@ -14,6 +16,14 @@ import (
 	"strings"
 )
 
+var serverStats *stats.ServerStats
+
+func init() {
+	serverStats = stats.NewServerStats()
+	go serverStats.Start()
+
+}
+
 func writeJson(w http.ResponseWriter, r *http.Request, obj interface{}) (err error) {
 	w.Header().Set("Content-Type", "application/javascript")
 	var bytes []byte
@@ -152,3 +162,15 @@ func parseURLPath(path string) (vid, fid, filename, ext string, isVolumeIdOnly b
 	}
 	return
 }
+func statsCounterHandler(w http.ResponseWriter, r *http.Request) {
+	m := make(map[string]interface{})
+	m["Version"] = util.VERSION
+	m["Statistics"] = serverStats
+	writeJsonQuiet(w, r, m)
+}
+func statsMemoryHandler(w http.ResponseWriter, r *http.Request) {
+	m := make(map[string]interface{})
+	m["Version"] = util.VERSION
+	m["Statistics"] = serverStats
+	writeJsonQuiet(w, r, m)
+}
diff --git a/go/weed/weed_server/master_server.go b/go/weed/weed_server/master_server.go
index 417aa81bd..63cd18546 100644
--- a/go/weed/weed_server/master_server.go
+++ b/go/weed/weed_server/master_server.go
@@ -23,7 +23,6 @@ type MasterServer struct {
 	defaultReplicaPlacement string
 	garbageThreshold        string
 	whiteList               []string
-	version                 string
 
 	Topo   *topology.Topology
 	vg     *replication.VolumeGrowth
@@ -32,7 +31,7 @@ type MasterServer struct {
 	bounedLeaderChan chan int
 }
 
-func NewMasterServer(r *mux.Router, version string, port int, metaFolder string,
+func NewMasterServer(r *mux.Router, port int, metaFolder string,
 	volumeSizeLimitMB uint,
 	pulseSeconds int,
 	confFile string,
@@ -41,7 +40,6 @@ func NewMasterServer(r *mux.Router, version string, port int, metaFolder string,
 	whiteList []string,
 ) *MasterServer {
 	ms := &MasterServer{
-		version:                 version,
 		volumeSizeLimitMB:       volumeSizeLimitMB,
 		pulseSeconds:            pulseSeconds,
 		defaultReplicaPlacement: defaultReplicaPlacement,
@@ -68,6 +66,8 @@ func NewMasterServer(r *mux.Router, version string, port int, metaFolder string,
 	r.HandleFunc("/vol/vacuum", ms.proxyToLeader(secure(ms.whiteList, ms.volumeVacuumHandler)))
 	r.HandleFunc("/submit", secure(ms.whiteList, ms.submitFromMasterServerHandler))
 	r.HandleFunc("/{filekey}", ms.redirectHandler)
+	r.HandleFunc("/stats/counter", secure(ms.whiteList, statsCounterHandler))
+	r.HandleFunc("/stats/memory", secure(ms.whiteList, statsMemoryHandler))
 
 	ms.Topo.StartRefreshWritableVolumes(garbageThreshold)
 
diff --git a/go/weed/weed_server/master_server_handlers.go b/go/weed/weed_server/master_server_handlers.go
index 1ea837a2c..a2f7b162c 100644
--- a/go/weed/weed_server/master_server_handlers.go
+++ b/go/weed/weed_server/master_server_handlers.go
@@ -1,6 +1,7 @@
 package weed_server
 
 import (
+	"code.google.com/p/weed-fs/go/stats"
 	"code.google.com/p/weed-fs/go/storage"
 	"code.google.com/p/weed-fs/go/util"
 	"encoding/json"
@@ -37,6 +38,7 @@ func (ms *MasterServer) dirLookupHandler(w http.ResponseWriter, r *http.Request)
 }
 
 func (ms *MasterServer) dirAssignHandler(w http.ResponseWriter, r *http.Request) {
+	stats.AssignRequest()
 	c, e := strconv.Atoi(r.FormValue("count"))
 	if e != nil {
 		c = 1
@@ -119,7 +121,7 @@ func (ms *MasterServer) dirJoinHandler(w http.ResponseWriter, r *http.Request) {
 
 func (ms *MasterServer) dirStatusHandler(w http.ResponseWriter, r *http.Request) {
 	m := make(map[string]interface{})
-	m["Version"] = ms.version
+	m["Version"] = util.VERSION
 	m["Topology"] = ms.Topo.ToMap()
 	writeJsonQuiet(w, r, m)
 }
@@ -159,7 +161,7 @@ func (ms *MasterServer) volumeGrowHandler(w http.ResponseWriter, r *http.Request
 
 func (ms *MasterServer) volumeStatusHandler(w http.ResponseWriter, r *http.Request) {
 	m := make(map[string]interface{})
-	m["Version"] = ms.version
+	m["Version"] = util.VERSION
 	m["Volumes"] = ms.Topo.ToVolumeMap()
 	writeJsonQuiet(w, r, m)
 }
diff --git a/go/weed/weed_server/raft_server.go b/go/weed/weed_server/raft_server.go
index 15ec99726..6b03ea7fb 100644
--- a/go/weed/weed_server/raft_server.go
+++ b/go/weed/weed_server/raft_server.go
@@ -21,14 +21,12 @@ type RaftServer struct {
 	raftServer raft.Server
 	dataDir    string
 	httpAddr   string
-	version    string
 	router     *mux.Router
 	topo       *topology.Topology
 }
 
-func NewRaftServer(r *mux.Router, version string, peers []string, httpAddr string, dataDir string, topo *topology.Topology, pulseSeconds int) *RaftServer {
+func NewRaftServer(r *mux.Router, peers []string, httpAddr string, dataDir string, topo *topology.Topology, pulseSeconds int) *RaftServer {
 	s := &RaftServer{
-		version:  version,
 		peers:    peers,
 		httpAddr: httpAddr,
 		dataDir:  dataDir,
diff --git a/go/weed/weed_server/volume_server.go b/go/weed/weed_server/volume_server.go
index b4fc4f4ea..639a08c19 100644
--- a/go/weed/weed_server/volume_server.go
+++ b/go/weed/weed_server/volume_server.go
@@ -15,15 +15,13 @@ type VolumeServer struct {
 	rack         string
 	whiteList    []string
 	store        *storage.Store
-	version      string
 }
 
-func NewVolumeServer(r *http.ServeMux, version string, ip string, port int, publicUrl string, folders []string, maxCounts []int,
+func NewVolumeServer(r *http.ServeMux, ip string, port int, publicUrl string, folders []string, maxCounts []int,
 	masterNode string, pulseSeconds int,
 	dataCenter string, rack string,
 	whiteList []string) *VolumeServer {
 	vs := &VolumeServer{
-		version:      version,
 		masterNode:   masterNode,
 		pulseSeconds: pulseSeconds,
 		dataCenter:   dataCenter,
@@ -40,6 +38,8 @@ func NewVolumeServer(r *http.ServeMux, version string, ip string, port int, publ
 	r.HandleFunc("/admin/vacuum_volume_commit", secure(vs.whiteList, vs.vacuumVolumeCommitHandler))
 	r.HandleFunc("/admin/freeze_volume", secure(vs.whiteList, vs.freezeVolumeHandler))
 	r.HandleFunc("/admin/delete_collection", secure(vs.whiteList, vs.deleteCollectionHandler))
+	r.HandleFunc("/stats/counter", secure(vs.whiteList, statsCounterHandler))
+	r.HandleFunc("/stats/memory", secure(vs.whiteList, statsMemoryHandler))
 	r.HandleFunc("/", vs.storeHandler)
 
 	go func() {
diff --git a/go/weed/weed_server/volume_server_handlers.go b/go/weed/weed_server/volume_server_handlers.go
index fc7d91783..96acb4901 100644
--- a/go/weed/weed_server/volume_server_handlers.go
+++ b/go/weed/weed_server/volume_server_handlers.go
@@ -4,7 +4,9 @@ import (
 	"code.google.com/p/weed-fs/go/glog"
 	"code.google.com/p/weed-fs/go/operation"
 	"code.google.com/p/weed-fs/go/replication"
+	"code.google.com/p/weed-fs/go/stats"
 	"code.google.com/p/weed-fs/go/storage"
+	"code.google.com/p/weed-fs/go/util"
 	"mime"
 	"net/http"
 	"strconv"
@@ -16,7 +18,7 @@ var fileNameEscaper = strings.NewReplacer("\\", "\\\\", "\"", "\\\"")
 
 func (vs *VolumeServer) statusHandler(w http.ResponseWriter, r *http.Request) {
 	m := make(map[string]interface{})
-	m["Version"] = vs.version
+	m["Version"] = util.VERSION
 	m["Volumes"] = vs.store.Status()
 	writeJsonQuiet(w, r, m)
 }
@@ -86,14 +88,19 @@ func (vs *VolumeServer) submitFromVolumeServerHandler(w http.ResponseWriter, r *
 func (vs *VolumeServer) storeHandler(w http.ResponseWriter, r *http.Request) {
 	switch r.Method {
 	case "GET":
+		stats.ReadRequest()
 		vs.GetOrHeadHandler(w, r, true)
 	case "HEAD":
+		stats.ReadRequest()
 		vs.GetOrHeadHandler(w, r, false)
 	case "DELETE":
+		stats.DeleteRequest()
 		secure(vs.whiteList, vs.DeleteHandler)(w, r)
 	case "PUT":
+		stats.WriteRequest()
 		secure(vs.whiteList, vs.PostHandler)(w, r)
 	case "POST":
+		stats.WriteRequest()
 		secure(vs.whiteList, vs.PostHandler)(w, r)
 	}
 }