Merge pull request #18921 from timothysc/etcd_datarace

Fix data race on cancel variable in etcd code

Merge pull request #18921 from timothysc/etcd_datarace
1f24297e · Wojciech Tyczynski · 7851d24d · e3311aa9 · 1f24297e
Commit 1f24297e authored Dec 19, 2015 by Wojciech Tyczynski
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

etcd_watcher.go pkg/storage/etcd/etcd_watcher.go +2 -0

No files found.
--- 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)