Skip to content
Snippets Groups Projects
Commit d52b1568 authored by zengfanwei's avatar zengfanwei
Browse files

rollback

parent 1871621b
No related branches found
No related tags found
No related merge requests found
...@@ -68,10 +68,6 @@ func (pfw *ProtocolFilterWrapper) Destroy() { ...@@ -68,10 +68,6 @@ func (pfw *ProtocolFilterWrapper) Destroy() {
} }
func buildInvokerChain(invoker protocol.Invoker, key string) protocol.Invoker { func buildInvokerChain(invoker protocol.Invoker, key string) protocol.Invoker {
if invoker == nil {
return invoker
}
filterName := invoker.GetUrl().GetParam(key, "") filterName := invoker.GetUrl().GetParam(key, "")
if filterName == "" { if filterName == "" {
return invoker return invoker
......
...@@ -38,7 +38,7 @@ const ( ...@@ -38,7 +38,7 @@ const (
// ConnDelay connection delay interval // ConnDelay connection delay interval
ConnDelay = 3 ConnDelay = 3
// MaxFailTimes max fail times // MaxFailTimes max fail times
MaxFailTimes = 3 MaxFailTimes = 15
) )
var ( var (
...@@ -259,6 +259,7 @@ func (z *ZookeeperClient) HandleZkEvent(session <-chan zk.Event) { ...@@ -259,6 +259,7 @@ func (z *ZookeeperClient) HandleZkEvent(session <-chan zk.Event) {
switch (int)(event.State) { switch (int)(event.State) {
case (int)(zk.StateDisconnected): case (int)(zk.StateDisconnected):
logger.Warnf("zk{addr:%s} state is StateDisconnected, so close the zk client{name:%s}.", z.ZkAddrs, z.name) logger.Warnf("zk{addr:%s} state is StateDisconnected, so close the zk client{name:%s}.", z.ZkAddrs, z.name)
z.stop()
z.Lock() z.Lock()
conn := z.Conn conn := z.Conn
z.Conn = nil z.Conn = nil
...@@ -266,7 +267,6 @@ func (z *ZookeeperClient) HandleZkEvent(session <-chan zk.Event) { ...@@ -266,7 +267,6 @@ func (z *ZookeeperClient) HandleZkEvent(session <-chan zk.Event) {
if conn != nil { if conn != nil {
conn.Close() conn.Close()
} }
z.stop()
return return
case (int)(zk.EventNodeDataChanged), (int)(zk.EventNodeChildrenChanged): case (int)(zk.EventNodeDataChanged), (int)(zk.EventNodeChildrenChanged):
logger.Infof("zkClient{%s} get zk node changed event{path:%s}", z.name, event.Path) logger.Infof("zkClient{%s} get zk node changed event{path:%s}", z.name, event.Path)
......
...@@ -134,7 +134,7 @@ func (l *ZkEventListener) handleZkNodeEvent(zkPath string, children []string, li ...@@ -134,7 +134,7 @@ func (l *ZkEventListener) handleZkNodeEvent(zkPath string, children []string, li
newChildren, err := l.client.GetChildren(zkPath) newChildren, err := l.client.GetChildren(zkPath)
if err != nil { if err != nil {
/*if err == errNilChildren { if err == errNilChildren {
content, _, err := l.client.Conn.Get(zkPath) content, _, err := l.client.Conn.Get(zkPath)
if err != nil { if err != nil {
logger.Errorf("Get new node path {%v} 's content error,message is {%v}", zkPath, perrors.WithStack(err)) logger.Errorf("Get new node path {%v} 's content error,message is {%v}", zkPath, perrors.WithStack(err))
...@@ -144,9 +144,7 @@ func (l *ZkEventListener) handleZkNodeEvent(zkPath string, children []string, li ...@@ -144,9 +144,7 @@ func (l *ZkEventListener) handleZkNodeEvent(zkPath string, children []string, li
} else { } else {
logger.Errorf("path{%s} child nodes changed, zk.Children() = error{%v}", zkPath, perrors.WithStack(err)) logger.Errorf("path{%s} child nodes changed, zk.Children() = error{%v}", zkPath, perrors.WithStack(err))
}*/ }
logger.Errorf("path{%s} child nodes are empty, zk.Children() = error{%v}", zkPath, perrors.WithStack(err))
return
} }
// a node was added -- listen the new node // a node was added -- listen the new node
...@@ -253,7 +251,7 @@ func (l *ZkEventListener) listenDirEvent(conf *common.URL, zkPath string, listen ...@@ -253,7 +251,7 @@ func (l *ZkEventListener) listenDirEvent(conf *common.URL, zkPath string, listen
case <-event: case <-event:
logger.Infof("get zk.EventNodeDataChange notify event") logger.Infof("get zk.EventNodeDataChange notify event")
l.client.UnregisterEvent(zkPath, &event) l.client.UnregisterEvent(zkPath, &event)
l.handleZkNodeEvent(zkPath, children, listener) l.handleZkNodeEvent(zkPath, nil, listener)
continue continue
} }
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment