Fix data race on cancel variable in etcd code

2015-12-18 18:37:45 -06:00
parent 977854b8de
commit e3311aa93a
1 changed files with 2 additions and 0 deletions
--- a/pkg/storage/etcd/etcd_watcher.go
+++ b/pkg/storage/etcd/etcd_watcher.go
@@ -158,7 +158,9 @@ func (w *etcdWatcher) etcdWatch(ctx context.Context, client etcd.KeysAPI, key st
 		AfterIndex: resourceVersion,
 	}
 	watcher := client.Watcher(key, &opts)
+	w.stopLock.Lock()
 	w.ctx, w.cancel = context.WithCancel(ctx)
+	w.stopLock.Unlock()

 	for {
 		resp, err := watcher.Next(w.ctx)