Rft : Optimize lock for zookeeper registry

registry/zookeeper/registry.go

@@ -158,6 +158,7 @@ func (r *zkRegistry) DoRegister(root string, node string) error {
 func (r *zkRegistry) DoUnregister(root string, node string) error {
 	r.cltLock.Lock()
 	defer r.cltLock.Unlock()
+
 	if !r.ZkClient().ZkConnValid() {
 		return perrors.Errorf("zk client is not valid.")
 	}

remoting/zookeeper/client.go

@@ -51,7 +51,7 @@ var (
 type ZookeeperClient struct {
 	name          string
 	ZkAddrs       []string
-	sync.Mutex    // for conn
+	sync.RWMutex  // for conn
 	Conn          *zk.Conn
 	Timeout       time.Duration
 	exit          chan struct{}
@@ -419,9 +419,9 @@ func (z *ZookeeperClient) CreateWithValue(basePath string, value []byte) error {
 	for _, str := range strings.Split(basePath, "/")[1:] {
 		tmpPath = path.Join(tmpPath, "/", str)
 		err = errNilZkClientConn
-		z.Lock()
+		z.RLock()
 		conn := z.Conn
-		z.Unlock()
+		z.RUnlock()
 		if conn != nil {
 			_, err = conn.Create(tmpPath, value, 0, zk.WorldACL(zk.PermAll))
 		}
@@ -446,9 +446,9 @@ func (z *ZookeeperClient) Delete(basePath string) error {
 	)
 
 	err = errNilZkClientConn
-	z.Lock()
+	z.RLock()
 	conn := z.Conn
-	z.Unlock()
+	z.RUnlock()
 	if conn != nil {
 		err = conn.Delete(basePath, -1)
 	}
@@ -468,9 +468,9 @@ func (z *ZookeeperClient) RegisterTemp(basePath string, node string) (string, er
 	err = errNilZkClientConn
 	data = []byte("")
 	zkPath = path.Join(basePath) + "/" + node
-	z.Lock()
+	z.RLock()
 	conn := z.Conn
-	z.Unlock()
+	z.RUnlock()
 	if conn != nil {
 		tmpPath, err = conn.Create(zkPath, data, zk.FlagEphemeral, zk.WorldACL(zk.PermAll))
 	}
@@ -493,9 +493,9 @@ func (z *ZookeeperClient) RegisterTempSeq(basePath string, data []byte) (string,
 	)
 
 	err = errNilZkClientConn
-	z.Lock()
+	z.RLock()
 	conn := z.Conn
-	z.Unlock()
+	z.RUnlock()
 	if conn != nil {
 		tmpPath, err = conn.Create(
 			path.Join(basePath)+"/",
@@ -526,9 +526,9 @@ func (z *ZookeeperClient) GetChildrenW(path string) ([]string, <-chan zk.Event,
 	)
 
 	err = errNilZkClientConn
-	z.Lock()
+	z.RLock()
 	conn := z.Conn
-	z.Unlock()
+	z.RUnlock()
 	if conn != nil {
 		children, stat, watcher, err = conn.ChildrenW(path)
 	}
@@ -562,9 +562,9 @@ func (z *ZookeeperClient) GetChildren(path string) ([]string, error) {
 	)
 
 	err = errNilZkClientConn
-	z.Lock()
+	z.RLock()
 	conn := z.Conn
-	z.Unlock()
+	z.RUnlock()
 	if conn != nil {
 		children, stat, err = conn.Children(path)
 	}
@@ -595,9 +595,9 @@ func (z *ZookeeperClient) ExistW(zkPath string) (<-chan zk.Event, error) {
 	)
 
 	err = errNilZkClientConn
-	z.Lock()
+	z.RLock()
 	conn := z.Conn
-	z.Unlock()
+	z.RUnlock()
 	if conn != nil {
 		exist, _, watcher, err = conn.ExistsW(zkPath)
 	}