From cf7b30c651d22bae7c5b0bd5933ae1ae437dc5d8 Mon Sep 17 00:00:00 2001
From: pantianying <601666418@qq.com>
Date: Fri, 31 Jan 2020 19:19:21 +0800
Subject: [PATCH] ptr zk.lock
---
remoting/zookeeper/client.go | 69 ++++++++++++++++++++++--------------
1 file changed, 42 insertions(+), 27 deletions(-)
diff --git a/remoting/zookeeper/client.go b/remoting/zookeeper/client.go
index f67a2549c..c4f583230 100644
--- a/remoting/zookeeper/client.go
+++ b/remoting/zookeeper/client.go
@@ -261,11 +261,13 @@ LOOP:
logger.Warnf("zk{addr:%s} state is StateDisconnected, so close the zk client{name:%s}.", z.ZkAddrs, z.name)
z.stop()
z.Lock()
- if z.Conn != nil {
- z.Conn.Close()
- z.Conn = nil
- }
+ conn := z.Conn
+ z.Conn = nil
z.Unlock()
+ if conn != nil {
+ conn.Close()
+ }
+
break LOOP
case (int)(zk.EventNodeDataChanged), (int)(zk.EventNodeChildrenChanged):
logger.Infof("zkClient{%s} get zk node changed event{path:%s}", z.name, event.Path)
@@ -380,11 +382,13 @@ func (z *ZookeeperClient) Close() {
z.stop()
z.Wait.Wait()
z.Lock()
- if z.Conn != nil {
- z.Conn.Close()
- z.Conn = nil
- }
+ conn := z.Conn
+ z.Conn = nil
z.Unlock()
+ if conn != nil {
+ conn.Close()
+ }
+
logger.Warnf("zkClient{name:%s, zk addr:%s} exit now.", z.name, z.ZkAddrs)
}
@@ -400,10 +404,12 @@ func (z *ZookeeperClient) Create(basePath string) error {
tmpPath = path.Join(tmpPath, "/", str)
err = errNilZkClientConn
z.Lock()
- if z.Conn != nil {
- _, err = z.Conn.Create(tmpPath, []byte(""), 0, zk.WorldACL(zk.PermAll))
- }
+ conn := z.Conn
z.Unlock()
+ if conn != nil {
+ _, err = conn.Create(tmpPath, []byte(""), 0, zk.WorldACL(zk.PermAll))
+ }
+
if err != nil {
if err == zk.ErrNodeExists {
logger.Infof("zk.create(\"%s\") exists\n", tmpPath)
@@ -425,10 +431,11 @@ func (z *ZookeeperClient) Delete(basePath string) error {
err = errNilZkClientConn
z.Lock()
- if z.Conn != nil {
- err = z.Conn.Delete(basePath, -1)
- }
+ conn := z.Conn
z.Unlock()
+ if conn != nil {
+ err = conn.Delete(basePath, -1)
+ }
return perrors.WithMessagef(err, "Delete(basePath:%s)", basePath)
}
@@ -446,10 +453,12 @@ func (z *ZookeeperClient) RegisterTemp(basePath string, node string) (string, er
data = []byte("")
zkPath = path.Join(basePath) + "/" + node
z.Lock()
- if z.Conn != nil {
- tmpPath, err = z.Conn.Create(zkPath, data, zk.FlagEphemeral, zk.WorldACL(zk.PermAll))
- }
+ conn := z.Conn
z.Unlock()
+ if conn != nil {
+ tmpPath, err = conn.Create(zkPath, data, zk.FlagEphemeral, zk.WorldACL(zk.PermAll))
+ }
+
//if err != nil && err != zk.ErrNodeExists {
if err != nil {
logger.Warnf("conn.Create(\"%s\", zk.FlagEphemeral) = error(%v)\n", zkPath, perrors.WithStack(err))
@@ -469,15 +478,17 @@ func (z *ZookeeperClient) RegisterTempSeq(basePath string, data []byte) (string,
err = errNilZkClientConn
z.Lock()
- if z.Conn != nil {
- tmpPath, err = z.Conn.Create(
+ conn := z.Conn
+ z.Unlock()
+ if conn != nil {
+ tmpPath, err = conn.Create(
path.Join(basePath)+"/",
data,
zk.FlagEphemeral|zk.FlagSequence,
zk.WorldACL(zk.PermAll),
)
}
- z.Unlock()
+
logger.Debugf("zookeeperClient.RegisterTempSeq(basePath{%s}) = tempPath{%s}", basePath, tmpPath)
if err != nil && err != zk.ErrNodeExists {
logger.Errorf("zkClient{%s} conn.Create(\"%s\", \"%s\", zk.FlagEphemeral|zk.FlagSequence) error(%v)\n",
@@ -508,7 +519,7 @@ func (z *ZookeeperClient) GetChildrenW(path string) ([]string, <-chan zk.Event,
if err != nil {
if err == zk.ErrNoChildrenForEphemerals {
- return nil, nil, perrors.Errorf("path{%s} has none children", path)
+ return nil, nil, errNilChildren
}
if err == zk.ErrNoNode {
return nil, nil, errNilNode
@@ -536,10 +547,12 @@ func (z *ZookeeperClient) GetChildren(path string) ([]string, error) {
err = errNilZkClientConn
z.Lock()
- if z.Conn != nil {
- children, stat, err = z.Conn.Children(path)
- }
+ conn := z.Conn
z.Unlock()
+ if conn != nil {
+ children, stat, err = conn.Children(path)
+ }
+
if err != nil {
if err == zk.ErrNoNode {
return nil, perrors.Errorf("path{%s} has none children", path)
@@ -567,10 +580,12 @@ func (z *ZookeeperClient) ExistW(zkPath string) (<-chan zk.Event, error) {
err = errNilZkClientConn
z.Lock()
- if z.Conn != nil {
- exist, _, event, err = z.Conn.ExistsW(zkPath)
- }
+ conn := z.Conn
z.Unlock()
+ if conn != nil {
+ exist, _, event, err = conn.ExistsW(zkPath)
+ }
+
if err != nil {
logger.Warnf("zkClient{%s}.ExistsW(path{%s}) = error{%v}.", z.name, zkPath, perrors.WithStack(err))
return nil, perrors.WithMessagef(err, "zk.ExistsW(path:%s)", zkPath)
--
GitLab