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

fix node.go race between expire and update

Browse Source
This commit is contained in:
Xiang Li 2013-10-07 23:21:39 -07:00
parent a07802a347
commit 48e6137f46
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
store/node.go
View File

@ -279,14 +279,21 @@ func (n *Node) Expire(s *Store) {
// if timeout, delete the node // if timeout, delete the node
case <-time.After(duration): case <-time.After(duration):
// before expire get the lock, the expiration time
// of the node may be updated.
// we have to check again when get the lock
s.worldLock.Lock() s.worldLock.Lock()
defer s.worldLock.Unlock() defer s.worldLock.Unlock()
e := newEvent(Expire, n.Path, UndefIndex, UndefTerm) expired, _ := n.IsExpired()
s.WatcherHub.notify(e)
n.Remove(true, nil) if expired {
s.Stats.Inc(ExpireCount) e := newEvent(Expire, n.Path, UndefIndex, UndefTerm)
s.WatcherHub.notify(e)
n.Remove(true, nil)
s.Stats.Inc(ExpireCount)
}
return return