Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4494 from xiang90/sched

Browse Source 
*: fix schedule.Wait race
This commit is contained in:
Xiang Li 2016-02-11 15:56:01 -08:00
commit 40c598cfa6
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/schedule/schedule.go
View File

@ -37,8 +37,8 @@ type Scheduler interface {
// Finished returns the number of finished jobs // Finished returns the number of finished jobs
Finished() int Finished() int
// WaitFinish waits all pending jobs to finish. // WaitFinish waits until at least n job are finished and all pending jobs are finished.
WaitFinish() WaitFinish(n int)
// Stop stops the scheduler. // Stop stops the scheduler.
Stop() Stop()
@ -110,13 +110,9 @@ func (f *fifo) Finished() int {
return f.finished return f.finished
} }
func (f *fifo) WaitFinish() { func (f *fifo) WaitFinish(n int) {
f.finishCond.L.Lock() f.finishCond.L.Lock()
finish := f.finished for f.finished < n || len(f.pendings) != 0 {
f.finishCond.L.Unlock()
f.finishCond.L.Lock()
for f.finished == finish || len(f.pendings) != 0 {
f.finishCond.Wait() f.finishCond.Wait()
} }
f.finishCond.L.Unlock() f.finishCond.L.Unlock()

2
pkg/schedule/schedule_test.go
View File

@ -43,7 +43,7 @@ func TestFIFOSchedule(t *testing.T) {
s.Schedule(j) s.Schedule(j)
} }
s.WaitFinish() s.WaitFinish(100)
if s.Scheduled() != 100 { if s.Scheduled() != 100 {
t.Errorf("scheduled = %d, want %d", s.Scheduled(), 100) t.Errorf("scheduled = %d, want %d", s.Scheduled(), 100)
} }

2
storage/kvstore_test.go
View File

@ -337,7 +337,7 @@ func TestStoreCompact(t *testing.T) {
b.tx.rangeRespc <- rangeResp{[][]byte{key1, key2}, nil} b.tx.rangeRespc <- rangeResp{[][]byte{key1, key2}, nil}
s.Compact(3) s.Compact(3)
s.fifoSched.WaitFinish() s.fifoSched.WaitFinish(1)
if s.compactMainRev != 3 { if s.compactMainRev != 3 {
t.Errorf("compact main rev = %d, want 3", s.compactMainRev) t.Errorf("compact main rev = %d, want 3", s.compactMainRev)