From 4fe41802e70f4533e1f44f87b5a5bd358de2d349 Mon Sep 17 00:00:00 2001 From: Xargin Date: Fri, 12 Jun 2020 15:32:50 +0800 Subject: [PATCH 1/5] add mosn logo --- README.md | 34 +++++++++++++++++++++++++++++++--- README_CN.md | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 61 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b3e7173c43..0de082eeea 100644 --- a/README.md +++ b/README.md @@ -175,6 +175,34 @@ About dubbo-go benchmarking report, please refer to [dubbo benchmarking report]( If you are using [apache/dubbo-go](github.com/apache/dubbo-go) and think that it helps you or want do some contributions to it, please add your company to to [the user list](https://github.com/apache/dubbo-go/issues/2) to let us know your needs. -![ctrip](https://pic.c-ctrip.com/common/c_logo2013.png) -![Excellent Health Technology Group](https://raw.githubusercontent.com/dajiiu/photo/static/mirror/haozhuo_logo.png) -![tuya](https://raw.githubusercontent.com/pantianying/go-tool/master/picture/logo_2-removebg-preview.png) + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+
diff --git a/README_CN.md b/README_CN.md index 5c40249ed2..05a7a20ba0 100644 --- a/README_CN.md +++ b/README_CN.md @@ -173,6 +173,33 @@ go test ./... -coverprofile=coverage.txt -covermode=atomic 若你正在使用 [apache/dubbo-go](github.com/apache/dubbo-go) 且认为其有用或者向对其做改进，请忝列贵司信息于 [用户列表](https://github.com/apache/dubbo-go/issues/2)，以便我们知晓之。 -![ctrip](https://pic.c-ctrip.com/common/c_logo2013.png) -![Excellent Health Technology Group](https://raw.githubusercontent.com/dajiiu/photo/static/mirror/haozhuo_logo.png) -![tuya](https://raw.githubusercontent.com/pantianying/go-tool/master/picture/logo_2-removebg-preview.png) +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+
From 4e8561cebe19bd429a14fa9f560da8741d9802ef Mon Sep 17 00:00:00 2001 From: wangwx Date: Tue, 16 Jun 2020 11:35:49 +0800 Subject: [PATCH 2/5] fix coredump --- remoting/zookeeper/client.go | 2 +- remoting/zookeeper/listener.go | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/remoting/zookeeper/client.go b/remoting/zookeeper/client.go index 21486aab59..95c8a011c6 100644 --- a/remoting/zookeeper/client.go +++ b/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{} diff --git a/remoting/zookeeper/listener.go b/remoting/zookeeper/listener.go index eaf259f441..10fffe3d58 100644 --- a/remoting/zookeeper/listener.go +++ b/remoting/zookeeper/listener.go @@ -239,8 +239,13 @@ func (l *ZkEventListener) listenDirEvent(zkPath string, listener remoting.DataLi l.pathMapLock.Lock() l.pathMap[dubboPath] = struct{}{} l.pathMapLock.Unlock() - + //When Zk disconnected, the Conn will be set to nil, so here need check the value of Conn + l.client.RLock() + if l.client.Conn == nil{ + break + } content, _, err := l.client.Conn.Get(dubboPath) + l.client.RUnlock() if err != nil { logger.Errorf("Get new node path {%v} 's content error,message is {%v}", dubboPath, perrors.WithStack(err)) } From 236dba0f6456e3c27d2e0b73898d267c963197f2 Mon Sep 17 00:00:00 2001 From: wangwx Date: Tue, 16 Jun 2020 13:09:04 +0800 Subject: [PATCH 3/5] fmt file --- remoting/zookeeper/client.go | 2 +- remoting/zookeeper/listener.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/remoting/zookeeper/client.go b/remoting/zookeeper/client.go index 95c8a011c6..2a31cef7bd 100644 --- a/remoting/zookeeper/client.go +++ b/remoting/zookeeper/client.go @@ -51,7 +51,7 @@ var ( type ZookeeperClient struct { name string ZkAddrs []string - sync.RWMutex // for conn + sync.RWMutex // for conn Conn *zk.Conn Timeout time.Duration exit chan struct{} diff --git a/remoting/zookeeper/listener.go b/remoting/zookeeper/listener.go index 10fffe3d58..71d7948eb0 100644 --- a/remoting/zookeeper/listener.go +++ b/remoting/zookeeper/listener.go @@ -241,7 +241,7 @@ func (l *ZkEventListener) listenDirEvent(zkPath string, listener remoting.DataLi l.pathMapLock.Unlock() //When Zk disconnected, the Conn will be set to nil, so here need check the value of Conn l.client.RLock() - if l.client.Conn == nil{ + if l.client.Conn == nil { break } content, _, err := l.client.Conn.Get(dubboPath) From 217ed62a5a9fce06730ee959fb81d9b9e4e98770 Mon Sep 17 00:00:00 2001 From: wenxuwan Date: Wed, 17 Jun 2020 14:41:51 +0800 Subject: [PATCH 4/5] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 1190df58d3..3f8394536f 100644 --- a/README.md +++ b/README.md @@ -175,7 +175,6 @@ About dubbo-go benchmarking report, please refer to [dubbo benchmarking report]( If you are using [apache/dubbo-go](github.com/apache/dubbo-go) and think that it helps you or want do some contributions to it, please add your company to to [the user list](https://github.com/apache/dubbo-go/issues/2) to let us know your needs. - ![ctrip](https://pic.c-ctrip.com/common/c_logo2013.png) ![Excellent Health Technology Group](https://user-images.githubusercontent.com/52339367/84628582-80512200-af1b-11ea-945a-c6b4b9ad31f2.png) ![tuya](https://raw.githubusercontent.com/pantianying/go-tool/master/picture/logo_2-removebg-preview.png) From e2bca04b99c6dd06e900e88af03c2425f831b0d4 Mon Sep 17 00:00:00 2001 From: wangwx Date: Mon, 22 Jun 2020 14:24:28 +0800 Subject: [PATCH 5/5] add unlock --- remoting/zookeeper/listener.go | 1 + 1 file changed, 1 insertion(+) diff --git a/remoting/zookeeper/listener.go b/remoting/zookeeper/listener.go index 71d7948eb0..4cafa40705 100644 --- a/remoting/zookeeper/listener.go +++ b/remoting/zookeeper/listener.go @@ -242,6 +242,7 @@ func (l *ZkEventListener) listenDirEvent(zkPath string, listener remoting.DataLi //When Zk disconnected, the Conn will be set to nil, so here need check the value of Conn l.client.RLock() if l.client.Conn == nil { + l.client.RUnlock() break } content, _, err := l.client.Conn.Get(dubboPath)