mirror/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-11-24 19:19:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix delayed deletion

Browse Source
This commit is contained in:
Chris Lu 2014-03-23 21:56:24 -07:00
parent 5c6a166761
commit b1f083cb60
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
go/weed/benchmark.go
View File

@ -171,17 +171,17 @@ type delayedFile struct {
}
func writeFiles(idChan chan int, fileIdLineChan chan string, s *stats) {
deleteChan := make(chan *delayedFile, 100)
delayedDeleteChan := make(chan *delayedFile, 100)
var waitForDeletions sync.WaitGroup
for i := 0; i < 7; i++ {
go func() {
waitForDeletions.Add(1)
for df := range deleteChan {
for df := range delayedDeleteChan {
if df == nil {
break
}
if df.enterTime.Add(time.Second).Before(time.Now()) {
time.Sleep(df.enterTime.Add(time.Second).Sub(time.Now()))
if df.enterTime.After(time.Now()) {
time.Sleep(df.enterTime.Sub(time.Now()))
}
fp := df.fp
serverLimitChan[fp.Server] <- true
@ -210,7 +210,7 @@ func writeFiles(idChan chan int, fileIdLineChan chan string, s *stats) {
if _, err := fp.Upload(0, *b.server); err == nil {
if rand.Intn(100) < *b.deletePercentage {
s.total++
deleteChan <- &delayedFile{time.Now(), fp}
delayedDeleteChan <- &delayedFile{time.Now().Add(time.Second), fp}
} else {
fileIdLineChan <- fp.Fid
}
@ -232,7 +232,7 @@ func writeFiles(idChan chan int, fileIdLineChan chan string, s *stats) {
break
}
}
close(deleteChan)
close(delayedDeleteChan)
waitForDeletions.Wait()
wait.Done()
}