vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2313 from xiang90/cluster_mu 

etcdserver: move the mutex before what it guards
release-2.0
Xiang Li 2015-02-14 23:05:53 -08:00
parent 29f05bb217 04bd06d20b
commit 73e67628d9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etcdserver/cluster.go
View File

@ -56,14 +56,15 @@ type ClusterInfo interface {
// Cluster is a list of Members that belong to the same raft cluster
type Cluster struct {
id types.ID
token string
members map[types.ID]*Member
id types.ID
token string
store store.Store
sync.Mutex // guards members and removed map
members map[types.ID]*Member
// removed contains the ids of removed members in the cluster.
// removed id cannot be reused.
removed map[types.ID]bool
store store.Store
sync.Mutex
}
// NewClusterFromString returns a Cluster instantiated from the given cluster token