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

compactor: Fix data race in revision compactor test

Browse Source 
Use atomic functions to manipulate `rev` of `fakeRevGetter`
so that the tester goroutine can update the
value without race with the compactor's goroutine.
This commit is contained in:
Iwasaki Yudai 2017-06-27 13:42:56 -07:00
parent 4dd7ef0a60
commit c678dcbd91
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compactor/compactor_test.go
View File

@ -15,6 +15,8 @@
package compactor
import (
"sync/atomic"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/pkg/testutil"
"golang.org/x/net/context"
@ -36,6 +38,10 @@ type fakeRevGetter struct {
func (fr *fakeRevGetter) Rev() int64 {
fr.Record(testutil.Action{Name: "g"})
fr.rev++
return fr.rev
rev := atomic.AddInt64(&fr.rev, 1)
return rev
}
func (fr *fakeRevGetter) SetRev(rev int64) {
atomic.StoreInt64(&fr.rev, rev)
}

6
compactor/revision_test.go
View File

@ -42,7 +42,7 @@ func TestRevision(t *testing.T) {
rg.Wait(1)
// nothing happens
rg.rev = 99 // will be 100
rg.SetRev(99) // will be 100
expectedRevision := int64(90)
fc.Advance(checkCompactionInterval)
rg.Wait(1)
@ -55,12 +55,12 @@ func TestRevision(t *testing.T) {
}
// skip the same revision
rg.rev = 99 // will be 100
rg.SetRev(99) // will be 100
expectedRevision = int64(90)
rg.Wait(1)
// nothing happens
rg.rev = 199 // will be 200
rg.SetRev(199) // will be 200
expectedRevision = int64(190)
fc.Advance(checkCompactionInterval)
rg.Wait(1)