mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2024-01-19 02:48:24 +00:00
Add more thread safe counters. Tighten thread synchronization.
This commit is contained in:
parent
ed7b00bf02
commit
89fd1e4b6e
|
@ -132,12 +132,12 @@ func runbenchmark(cmd *Command, args []string) bool {
|
||||||
func bench_write() {
|
func bench_write() {
|
||||||
fileIdLineChan := make(chan string)
|
fileIdLineChan := make(chan string)
|
||||||
finishChan := make(chan bool)
|
finishChan := make(chan bool)
|
||||||
writeStats = newStats()
|
writeStats = newStats(*b.concurrency)
|
||||||
idChan := make(chan int)
|
idChan := make(chan int)
|
||||||
wait.Add(*b.concurrency)
|
|
||||||
go writeFileIds(*b.idListFile, fileIdLineChan, finishChan)
|
go writeFileIds(*b.idListFile, fileIdLineChan, finishChan)
|
||||||
for i := 0; i < *b.concurrency; i++ {
|
for i := 0; i < *b.concurrency; i++ {
|
||||||
go writeFiles(idChan, fileIdLineChan, writeStats)
|
wait.Add(1)
|
||||||
|
go writeFiles(idChan, fileIdLineChan, &writeStats.localStats[i])
|
||||||
}
|
}
|
||||||
writeStats.start = time.Now()
|
writeStats.start = time.Now()
|
||||||
writeStats.total = *b.numberOfFiles
|
writeStats.total = *b.numberOfFiles
|
||||||
|
@ -150,7 +150,6 @@ func bench_write() {
|
||||||
writeStats.end = time.Now()
|
writeStats.end = time.Now()
|
||||||
wait.Add(1)
|
wait.Add(1)
|
||||||
finishChan <- true
|
finishChan <- true
|
||||||
finishChan <- true
|
|
||||||
close(finishChan)
|
close(finishChan)
|
||||||
wait.Wait()
|
wait.Wait()
|
||||||
writeStats.printStats()
|
writeStats.printStats()
|
||||||
|
@ -159,14 +158,14 @@ func bench_write() {
|
||||||
func bench_read() {
|
func bench_read() {
|
||||||
fileIdLineChan := make(chan string)
|
fileIdLineChan := make(chan string)
|
||||||
finishChan := make(chan bool)
|
finishChan := make(chan bool)
|
||||||
readStats = newStats()
|
readStats = newStats(*b.concurrency)
|
||||||
wait.Add(*b.concurrency)
|
|
||||||
go readFileIds(*b.idListFile, fileIdLineChan)
|
go readFileIds(*b.idListFile, fileIdLineChan)
|
||||||
readStats.start = time.Now()
|
readStats.start = time.Now()
|
||||||
readStats.total = *b.numberOfFiles
|
readStats.total = *b.numberOfFiles
|
||||||
go readStats.checkProgress("Randomly Reading Benchmark", finishChan)
|
go readStats.checkProgress("Randomly Reading Benchmark", finishChan)
|
||||||
for i := 0; i < *b.concurrency; i++ {
|
for i := 0; i < *b.concurrency; i++ {
|
||||||
go readFiles(fileIdLineChan, readStats)
|
wait.Add(1)
|
||||||
|
go readFiles(fileIdLineChan, &readStats.localStats[i])
|
||||||
}
|
}
|
||||||
wait.Wait()
|
wait.Wait()
|
||||||
finishChan <- true
|
finishChan <- true
|
||||||
|
@ -180,12 +179,13 @@ type delayedFile struct {
|
||||||
fp *operation.FilePart
|
fp *operation.FilePart
|
||||||
}
|
}
|
||||||
|
|
||||||
func writeFiles(idChan chan int, fileIdLineChan chan string, s *stats) {
|
func writeFiles(idChan chan int, fileIdLineChan chan string, s *stat) {
|
||||||
|
defer wait.Done()
|
||||||
delayedDeleteChan := make(chan *delayedFile, 100)
|
delayedDeleteChan := make(chan *delayedFile, 100)
|
||||||
var waitForDeletions sync.WaitGroup
|
var waitForDeletions sync.WaitGroup
|
||||||
for i := 0; i < 7; i++ {
|
for i := 0; i < 7; i++ {
|
||||||
go func() {
|
|
||||||
waitForDeletions.Add(1)
|
waitForDeletions.Add(1)
|
||||||
|
go func() {
|
||||||
for df := range delayedDeleteChan {
|
for df := range delayedDeleteChan {
|
||||||
if df == nil {
|
if df == nil {
|
||||||
break
|
break
|
||||||
|
@ -228,6 +228,7 @@ func writeFiles(idChan chan int, fileIdLineChan chan string, s *stats) {
|
||||||
s.transferred += fileSize
|
s.transferred += fileSize
|
||||||
} else {
|
} else {
|
||||||
s.failed++
|
s.failed++
|
||||||
|
fmt.Printf("Failed to write with error:%v\n", err)
|
||||||
}
|
}
|
||||||
writeStats.addSample(time.Now().Sub(start))
|
writeStats.addSample(time.Now().Sub(start))
|
||||||
<-serverLimitChan[fp.Server]
|
<-serverLimitChan[fp.Server]
|
||||||
|
@ -244,10 +245,10 @@ func writeFiles(idChan chan int, fileIdLineChan chan string, s *stats) {
|
||||||
}
|
}
|
||||||
close(delayedDeleteChan)
|
close(delayedDeleteChan)
|
||||||
waitForDeletions.Wait()
|
waitForDeletions.Wait()
|
||||||
wait.Done()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func readFiles(fileIdLineChan chan string, s *stats) {
|
func readFiles(fileIdLineChan chan string, s *stat) {
|
||||||
|
defer wait.Done()
|
||||||
serverLimitChan := make(map[string]chan bool)
|
serverLimitChan := make(map[string]chan bool)
|
||||||
masterLimitChan := make(chan bool, 1)
|
masterLimitChan := make(chan bool, 1)
|
||||||
for {
|
for {
|
||||||
|
@ -288,7 +289,7 @@ func readFiles(fileIdLineChan chan string, s *stats) {
|
||||||
readStats.addSample(time.Now().Sub(start))
|
readStats.addSample(time.Now().Sub(start))
|
||||||
} else {
|
} else {
|
||||||
s.failed++
|
s.failed++
|
||||||
println("!!!! Failed to read from ", url, " !!!!!")
|
fmt.Printf("Failed to read %s error:%v\n", url, err)
|
||||||
}
|
}
|
||||||
<-serverLimitChan[server]
|
<-serverLimitChan[server]
|
||||||
} else {
|
} else {
|
||||||
|
@ -299,7 +300,6 @@ func readFiles(fileIdLineChan chan string, s *stats) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
wait.Done()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func writeFileIds(fileName string, fileIdLineChan chan string, finishChan chan bool) {
|
func writeFileIds(fileName string, fileIdLineChan chan string, finishChan chan bool) {
|
||||||
|
@ -365,18 +365,26 @@ const (
|
||||||
type stats struct {
|
type stats struct {
|
||||||
data []int
|
data []int
|
||||||
overflow []int
|
overflow []int
|
||||||
|
localStats []stat
|
||||||
|
start time.Time
|
||||||
|
end time.Time
|
||||||
|
total int
|
||||||
|
}
|
||||||
|
type stat struct {
|
||||||
completed int
|
completed int
|
||||||
failed int
|
failed int
|
||||||
total int
|
total int
|
||||||
transferred int64
|
transferred int64
|
||||||
start time.Time
|
|
||||||
end time.Time
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var percentages = []int{50, 66, 75, 80, 90, 95, 98, 99, 100}
|
var percentages = []int{50, 66, 75, 80, 90, 95, 98, 99, 100}
|
||||||
|
|
||||||
func newStats() *stats {
|
func newStats(n int) *stats {
|
||||||
return &stats{data: make([]int, benchResolution), overflow: make([]int, 0)}
|
return &stats{
|
||||||
|
data: make([]int, benchResolution),
|
||||||
|
overflow: make([]int, 0),
|
||||||
|
localStats: make([]stat, n),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *stats) addSample(d time.Duration) {
|
func (s *stats) addSample(d time.Duration) {
|
||||||
|
@ -399,26 +407,38 @@ func (s *stats) checkProgress(testName string, finishChan chan bool) {
|
||||||
case <-finishChan:
|
case <-finishChan:
|
||||||
return
|
return
|
||||||
case t := <-ticker:
|
case t := <-ticker:
|
||||||
completed, transferred, taken := s.completed-lastCompleted, s.transferred-lastTransferred, t.Sub(lastTime)
|
completed, transferred, taken, total := 0, int64(0), t.Sub(lastTime), s.total
|
||||||
|
for _, localStat := range s.localStats {
|
||||||
|
completed += localStat.completed
|
||||||
|
transferred += localStat.transferred
|
||||||
|
total += localStat.total
|
||||||
|
}
|
||||||
fmt.Printf("Completed %d of %d requests, %3.1f%% %3.1f/s %3.1fMB/s\n",
|
fmt.Printf("Completed %d of %d requests, %3.1f%% %3.1f/s %3.1fMB/s\n",
|
||||||
s.completed, s.total, float64(s.completed)*100/float64(s.total),
|
completed, total, float64(completed)*100/float64(total),
|
||||||
float64(completed)*float64(int64(time.Second))/float64(int64(taken)),
|
float64(completed-lastCompleted)*float64(int64(time.Second))/float64(int64(taken)),
|
||||||
float64(transferred)*float64(int64(time.Second))/float64(int64(taken))/float64(1024*1024),
|
float64(transferred-lastTransferred)*float64(int64(time.Second))/float64(int64(taken))/float64(1024*1024),
|
||||||
)
|
)
|
||||||
lastCompleted, lastTransferred, lastTime = s.completed, s.transferred, t
|
lastCompleted, lastTransferred, lastTime = completed, transferred, t
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *stats) printStats() {
|
func (s *stats) printStats() {
|
||||||
|
completed, failed, transferred, total := 0, 0, int64(0), s.total
|
||||||
|
for _, localStat := range s.localStats {
|
||||||
|
completed += localStat.completed
|
||||||
|
failed += localStat.failed
|
||||||
|
transferred += localStat.transferred
|
||||||
|
total += localStat.total
|
||||||
|
}
|
||||||
timeTaken := float64(int64(s.end.Sub(s.start))) / 1000000000
|
timeTaken := float64(int64(s.end.Sub(s.start))) / 1000000000
|
||||||
fmt.Printf("\nConcurrency Level: %d\n", *b.concurrency)
|
fmt.Printf("\nConcurrency Level: %d\n", *b.concurrency)
|
||||||
fmt.Printf("Time taken for tests: %.3f seconds\n", timeTaken)
|
fmt.Printf("Time taken for tests: %.3f seconds\n", timeTaken)
|
||||||
fmt.Printf("Complete requests: %d\n", s.completed)
|
fmt.Printf("Complete requests: %d\n", completed)
|
||||||
fmt.Printf("Failed requests: %d\n", s.failed)
|
fmt.Printf("Failed requests: %d\n", failed)
|
||||||
fmt.Printf("Total transferred: %d bytes\n", s.transferred)
|
fmt.Printf("Total transferred: %d bytes\n", transferred)
|
||||||
fmt.Printf("Requests per second: %.2f [#/sec]\n", float64(s.completed)/timeTaken)
|
fmt.Printf("Requests per second: %.2f [#/sec]\n", float64(completed)/timeTaken)
|
||||||
fmt.Printf("Transfer rate: %.2f [Kbytes/sec]\n", float64(s.transferred)/1024/timeTaken)
|
fmt.Printf("Transfer rate: %.2f [Kbytes/sec]\n", float64(transferred)/1024/timeTaken)
|
||||||
n, sum := 0, 0
|
n, sum := 0, 0
|
||||||
min, max := 10000000, 0
|
min, max := 10000000, 0
|
||||||
for i := 0; i < len(s.data); i++ {
|
for i := 0; i < len(s.data); i++ {
|
||||||
|
@ -544,4 +564,3 @@ func Readln(r *bufio.Reader) ([]byte, error) {
|
||||||
}
|
}
|
||||||
return ln, err
|
return ln, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue