From 04bd06d20b60d106d99db9001eddfc809c4e62ba Mon Sep 17 00:00:00 2001
From: Xiang Li <xiang.li@coreos.com>
Date: Sat, 14 Feb 2015 22:26:12 -0800
Subject: [PATCH] etcdserver: move the mutex before what it guards

---
 etcdserver/cluster.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/etcdserver/cluster.go b/etcdserver/cluster.go
index 0acbf1da1..908aeed29 100644
--- a/etcdserver/cluster.go
+++ b/etcdserver/cluster.go
@@ -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