Merge pull request #710 from xiangli-cmu/fix_race

Fix race

server/raft_server_stats.go

@@ -1,6 +1,7 @@
 package server
 
 import (
+	"sync"
 	"time"
 
 	"github.com/coreos/etcd/third_party/github.com/goraft/raft"
@@ -27,6 +28,8 @@ type raftServerStats struct {
 
 	sendRateQueue *statsQueue
 	recvRateQueue *statsQueue
+
+	sync.Mutex
 }
 
 func NewRaftServerStats(name string) *raftServerStats {
@@ -43,6 +46,9 @@ func NewRaftServerStats(name string) *raftServerStats {
 }
 
 func (ss *raftServerStats) RecvAppendReq(leaderName string, pkgSize int) {
+	ss.Lock()
+	defer ss.Unlock()
+
 	ss.State = raft.Follower
 	if leaderName != ss.LeaderInfo.Name {
 		ss.LeaderInfo.Name = leaderName
@@ -54,6 +60,9 @@ func (ss *raftServerStats) RecvAppendReq(leaderName string, pkgSize int) {
 }
 
 func (ss *raftServerStats) SendAppendReq(pkgSize int) {
+	ss.Lock()
+	defer ss.Unlock()
+
 	now := time.Now()
 
 	if ss.State != raft.Leader {

server/registry.go

@@ -45,6 +45,9 @@ func NewRegistry(s store.Store) *Registry {
 
 // Peers returns a list of cached peer names.
 func (r *Registry) Peers() []string {
+	r.Lock()
+	defer r.Unlock()
+
 	names := make([]string, 0, len(r.peers))
 	for name := range r.peers {
 		names = append(names, name)
@@ -55,6 +58,9 @@ func (r *Registry) Peers() []string {
 
 // Proxies returns a list of cached proxy names.
 func (r *Registry) Proxies() []string {
+	r.Lock()
+	defer r.Unlock()
+
 	names := make([]string, 0, len(r.proxies))
 	for name := range r.proxies {
 		names = append(names, name)
@@ -68,6 +74,9 @@ func (r *Registry) RegisterPeer(name string, peerURL string, machURL string) err
 	if err := r.register(RegistryPeerKey, name, peerURL, machURL); err != nil {
 		return err
 	}
+
+	r.Lock()
+	defer r.Unlock()
 	r.peers[name] = r.load(RegistryPeerKey, name)
 	return nil
 }
@@ -77,14 +86,14 @@ func (r *Registry) RegisterProxy(name string, peerURL string, machURL string) er
 	if err := r.register(RegistryProxyKey, name, peerURL, machURL); err != nil {
 		return err
 	}
+
+	r.Lock()
+	defer r.Unlock()
 	r.proxies[name] = r.load(RegistryProxyKey, name)
 	return nil
 }
 
 func (r *Registry) register(key, name string, peerURL string, machURL string) error {
-	r.Lock()
-	defer r.Unlock()
-
 	// Write data to store.
 	v := url.Values{}
 	v.Set("raft", peerURL)
@@ -105,9 +114,6 @@ func (r *Registry) UnregisterProxy(name string) error {
 }
 
 func (r *Registry) unregister(key, name string) error {
-	r.Lock()
-	defer r.Unlock()
-
 	// Remove the key from the store.
 	_, err := r.store.Delete(path.Join(key, name), false, false)
 	log.Debugf("Unregister: %s", name)
@@ -282,6 +288,9 @@ func (r *Registry) urls(key, leaderName, selfName string, url func(key, name str
 
 // Removes a node from the cache.
 func (r *Registry) Invalidate(name string) {
+	r.Lock()
+	defer r.Unlock()
+
 	delete(r.peers, name)
 	delete(r.proxies, name)
 }