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

clientv3/integration: fix race when setting progress report interval

Browse Source
This commit is contained in:
Anthony Romano
2016-03-27 02:39:46 -07:00
parent 2c83362e63
commit 91dc6b29a6
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
clientv3/integration/watch_test.go
View File

@@ -18,6 +18,7 @@ import (
"fmt"
"reflect"
"sort"
"sync/atomic"
"testing"
"time"
@@ -379,17 +380,19 @@ func TestWatchWithProgressNotifyNoEvent(t *testing.T) { testWatchWithProgressNot
func testWatchWithProgressNotify(t *testing.T, watchOnPut bool) {
defer testutil.AfterTest(t)
// accelerate report interval so test terminates quickly
oldpi := v3rpc.ProgressReportIntervalMilliseconds
// using atomics to avoid race warnings
atomic.StoreInt32(&v3rpc.ProgressReportIntervalMilliseconds, 3*1000)
pi := 3 * time.Second
defer func() { v3rpc.ProgressReportIntervalMilliseconds = oldpi }()
clus := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 3})
defer clus.Terminate(t)
wc := clientv3.NewWatcher(clus.RandClient())
defer wc.Close()
testInterval := 3 * time.Second
pi := v3rpc.ProgressReportInterval
v3rpc.ProgressReportInterval = testInterval
defer func() { v3rpc.ProgressReportInterval = pi }()
opts := []clientv3.OpOption{clientv3.WithProgressNotify()}
if watchOnPut {
opts = append(opts, clientv3.WithPrefix())

8
etcdserver/api/v3rpc/watch.go
View File

@@ -42,8 +42,9 @@ func NewWatchServer(s *etcdserver.EtcdServer) pb.WatchServer {
var (
// expose for testing purpose. External test can change this to a
// small value to finish fast.
ProgressReportInterval = 10 * time.Minute
// small value to finish fast. The type is int32 instead of time.Duration
// in order to placate the race detector by setting the value with atomic stores.
ProgressReportIntervalMilliseconds = int32(10 * 60 * 1000) // 10 minutes
)
const (
@@ -160,7 +161,8 @@ func (sws *serverWatchStream) sendLoop() {
// watch responses pending on a watch id creation message
pending := make(map[storage.WatchID][]*pb.WatchResponse)
progressTicker := time.NewTicker(ProgressReportInterval)
interval := time.Duration(ProgressReportIntervalMilliseconds) * time.Millisecond
progressTicker := time.NewTicker(interval)
defer progressTicker.Stop()
for {

9
integration/v3_watch_test.go
View File

@@ -20,6 +20,7 @@ import (
"reflect"
"sort"
"sync"
"sync/atomic"
"testing"
"time"
@@ -922,10 +923,12 @@ func waitResponse(wc pb.Watch_WatchClient, timeout time.Duration) (bool, *pb.Wat
}
func TestWatchWithProgressNotify(t *testing.T) {
// accelerate report interval so test terminates quickly
oldpi := v3rpc.ProgressReportIntervalMilliseconds
// using atomics to avoid race warnings
atomic.StoreInt32(&v3rpc.ProgressReportIntervalMilliseconds, 3*1000)
testInterval := 3 * time.Second
pi := v3rpc.ProgressReportInterval
v3rpc.ProgressReportInterval = testInterval
defer func() { v3rpc.ProgressReportInterval = pi }()
defer func() { v3rpc.ProgressReportIntervalMilliseconds = oldpi }()
defer testutil.AfterTest(t)
clus := NewClusterV3(t, &ClusterConfig{Size: 3})