gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #127 from yanyiwu/master

Browse source 
BUG FIXED and IMPROVEMENT
This commit is contained in:
chrislusf 2015-04-20 07:42:21 -07:00
parent 5c81fa1075 eaad4fa3c4
commit c42d33e800
4 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
go/stats/duration_counter.go
View file

@ -23,14 +23,11 @@ func NewRoundRobinCounter(slots int) *RoundRobinCounter {
return &RoundRobinCounter{LastIndex: -1, Values: make([]int64, slots), Counts: make([]int64, slots)} return &RoundRobinCounter{LastIndex: -1, Values: make([]int64, slots), Counts: make([]int64, slots)}
} }
func (rrc *RoundRobinCounter) Add(index int, val int64) { func (rrc *RoundRobinCounter) Add(index int, val int64) {
for rrc.LastIndex != index {
rrc.LastIndex++
if rrc.LastIndex >= len(rrc.Values) {
if index >= len(rrc.Values) { if index >= len(rrc.Values) {
break //just avoid endless loop return
}
rrc.LastIndex = 0
} }
for rrc.LastIndex != index {
rrc.LastIndex = (rrc.LastIndex + 1) % len(rrc.Values)
rrc.Values[rrc.LastIndex] = 0 rrc.Values[rrc.LastIndex] = 0
rrc.Counts[rrc.LastIndex] = 0 rrc.Counts[rrc.LastIndex] = 0
} }

19
go/stats/duration_counter_test.go Normal file
View file

@ -0,0 +1,19 @@
package stats
import "testing"
func TestRobinCounter(t *testing.T) {
rrc := NewRoundRobinCounter(60)
rrc.Add(0, 1)
rrc.Add(50, 2)
if rrc.Count() != 2 {
t.Fatal()
}
if rrc.Sum() != 3 {
t.Fatal()
}
/*
index out of range
*/
rrc.Add(61, 1)
}

2
go/weed/master.go
View file

@ -32,7 +32,7 @@ var (
masterIp = cmdMaster.Flag.String("ip", "localhost", "master <ip>|<server> address") masterIp = cmdMaster.Flag.String("ip", "localhost", "master <ip>|<server> address")
masterBindIp = cmdMaster.Flag.String("ip.bind", "0.0.0.0", "ip address to bind to") masterBindIp = cmdMaster.Flag.String("ip.bind", "0.0.0.0", "ip address to bind to")
metaFolder = cmdMaster.Flag.String("mdir", os.TempDir(), "data directory to store meta data") metaFolder = cmdMaster.Flag.String("mdir", os.TempDir(), "data directory to store meta data")
masterPeers = cmdMaster.Flag.String("peers", "", "other master nodes in comma separated ip:port list") masterPeers = cmdMaster.Flag.String("peers", "", "other master nodes in comma separated ip:port list, example: 127.0.0.1:9093,127.0.0.1:9094")
volumeSizeLimitMB = cmdMaster.Flag.Uint("volumeSizeLimitMB", 30*1000, "Master stops directing writes to oversized volumes.") volumeSizeLimitMB = cmdMaster.Flag.Uint("volumeSizeLimitMB", 30*1000, "Master stops directing writes to oversized volumes.")
mpulse = cmdMaster.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats") mpulse = cmdMaster.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats")
confFile = cmdMaster.Flag.String("conf", "/etc/weedfs/weedfs.conf", "Deprecating! xml configuration file") confFile = cmdMaster.Flag.String("conf", "/etc/weedfs/weedfs.conf", "Deprecating! xml configuration file")

2
go/weed/weed_server/master_ui/templates.go
View file

@ -54,7 +54,7 @@ var StatusTpl = template.Must(template.New("status").Parse(`<!DOCTYPE html>
<table class="table table-condensed table-striped"> <table class="table table-condensed table-striped">
<tr> <tr>
<th>Concurrent Connections</th> <th>Concurrent Connections</th>
<td>{{ .Counters.Connections.WeekCounter.Count }}</td> <td>{{ .Counters.Connections.WeekCounter.Sum }}</td>
</tr> </tr>
{{ range $key, $val := .Stats }} {{ range $key, $val := .Stats }}
<tr> <tr>