Merge pull request #3972 from xiang90/fix_race

store: fix data race when modify event in watchHub.
release-2.3
Xiang Li 2015-12-10 07:47:49 -08:00
commit 833c934bd4
1 changed files with 3 additions and 2 deletions

View File

@ -78,8 +78,9 @@ func (wh *watcherHub) watch(key string, recursive, stream bool, index, storeInde
defer wh.mutex.Unlock()
// If the event exists in the known history, append the EtcdIndex and return immediately
if event != nil {
event.EtcdIndex = storeIndex
w.eventChan <- event
ne := event.Clone()
ne.EtcdIndex = storeIndex
w.eventChan <- ne
return w, nil
}