Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
2
22a7f0099
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Summer2022
22a7f0099
Commits
2c60fede
Commit
2c60fede
authored
4 years ago
by
邹毅贤
Browse files
Options
Downloads
Patches
Plain Diff
change to service key
parent
8e92ca17
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
registry/zookeeper/listener.go
+20
-13
20 additions, 13 deletions
registry/zookeeper/listener.go
registry/zookeeper/registry.go
+13
-13
13 additions, 13 deletions
registry/zookeeper/registry.go
with
33 additions
and
26 deletions
registry/zookeeper/listener.go
+
20
−
13
View file @
2c60fede
...
...
@@ -53,7 +53,7 @@ func (l *RegistryDataListener) SubscribeURL(url *common.URL, listener config_cen
if
l
.
closed
{
return
}
l
.
subscribed
[
url
.
Key
()]
=
listener
l
.
subscribed
[
url
.
Service
Key
()]
=
listener
}
// UnSubscribeURL is used to set a watch listener for url
...
...
@@ -61,8 +61,8 @@ func (l *RegistryDataListener) UnSubscribeURL(url *common.URL) config_center.Con
if
l
.
closed
{
return
nil
}
listener
:=
l
.
subscribed
[
url
.
Key
()]
delete
(
l
.
subscribed
,
url
.
Key
())
listener
:=
l
.
subscribed
[
url
.
Service
Key
()]
delete
(
l
.
subscribed
,
url
.
Service
Key
())
return
listener
}
...
...
@@ -85,8 +85,8 @@ func (l *RegistryDataListener) DataChange(eventType remoting.Event) bool {
if
l
.
closed
{
return
false
}
for
url
,
listener
:=
range
l
.
subscribed
{
if
serviceURL
.
Key
()
==
url
{
for
serviceKey
,
listener
:=
range
l
.
subscribed
{
if
serviceURL
.
Service
Key
()
==
serviceKey
{
listener
.
Process
(
&
config_center
.
ConfigChangeEvent
{
Key
:
eventType
.
Path
,
...
...
@@ -111,18 +111,25 @@ func (l *RegistryDataListener) Close() {
// RegistryConfigurationListener represent the processor of zookeeper watcher
type
RegistryConfigurationListener
struct
{
client
*
zk
.
ZookeeperClient
registry
*
zkRegistry
events
chan
*
config_center
.
ConfigChangeEvent
isClosed
bool
close
chan
struct
{}
closeOnce
sync
.
Once
client
*
zk
.
ZookeeperClient
registry
*
zkRegistry
events
chan
*
config_center
.
ConfigChangeEvent
isClosed
bool
close
chan
struct
{}
closeOnce
sync
.
Once
subscribeURL
*
common
.
URL
}
// NewRegistryConfigurationListener for listening the event of zk.
func
NewRegistryConfigurationListener
(
client
*
zk
.
ZookeeperClient
,
reg
*
zkRegistry
)
*
RegistryConfigurationListener
{
func
NewRegistryConfigurationListener
(
client
*
zk
.
ZookeeperClient
,
reg
*
zkRegistry
,
conf
*
common
.
URL
)
*
RegistryConfigurationListener
{
reg
.
WaitGroup
()
.
Add
(
1
)
return
&
RegistryConfigurationListener
{
client
:
client
,
registry
:
reg
,
events
:
make
(
chan
*
config_center
.
ConfigChangeEvent
,
32
),
isClosed
:
false
,
close
:
make
(
chan
struct
{},
1
)}
return
&
RegistryConfigurationListener
{
client
:
client
,
registry
:
reg
,
events
:
make
(
chan
*
config_center
.
ConfigChangeEvent
,
32
),
isClosed
:
false
,
close
:
make
(
chan
struct
{},
1
),
subscribeURL
:
conf
}
}
// Process submit the ConfigChangeEvent to the event chan to notify all observer
...
...
This diff is collapsed.
Click to expand it.
registry/zookeeper/registry.go
+
13
−
13
View file @
2c60fede
...
...
@@ -129,17 +129,17 @@ func (r *zkRegistry) InitListeners() {
recoverd
:=
r
.
dataListener
.
subscribed
if
recoverd
!=
nil
&&
len
(
recoverd
)
>
0
{
// recover all subscribed url
for
recoveredURL
,
oldListener
:=
range
recoverd
{
if
regConfigListener
,
ok
:=
oldListener
.
(
*
RegistryConfigurationListener
);
ok
{
for
_
,
oldListener
:=
range
recoverd
{
var
(
regConfigListener
*
RegistryConfigurationListener
ok
bool
)
if
regConfigListener
,
ok
=
oldListener
.
(
*
RegistryConfigurationListener
);
ok
{
regConfigListener
.
Close
()
}
serviceURL
,
err
:=
common
.
NewURL
(
recoveredURL
)
if
err
!=
nil
{
logger
.
Errorf
(
"Listen NewURL(r{%s}) = error{%v}"
,
recoveredURL
,
err
)
continue
}
newDataListener
.
SubscribeURL
(
&
serviceURL
,
NewRegistryConfigurationListener
(
r
.
client
,
r
))
go
r
.
listener
.
ListenServiceEvent
(
&
serviceURL
,
fmt
.
Sprintf
(
"/dubbo/%s/"
+
constant
.
DEFAULT_CATEGORY
,
url
.
QueryEscape
(
serviceURL
.
Service
())),
newDataListener
)
newDataListener
.
SubscribeURL
(
regConfigListener
.
subscribeURL
,
NewRegistryConfigurationListener
(
r
.
client
,
r
,
regConfigListener
.
subscribeURL
))
go
r
.
listener
.
ListenServiceEvent
(
regConfigListener
.
subscribeURL
,
fmt
.
Sprintf
(
"/dubbo/%s/"
+
constant
.
DEFAULT_CATEGORY
,
url
.
QueryEscape
(
regConfigListener
.
subscribeURL
.
Service
())),
newDataListener
)
}
}
...
...
@@ -236,9 +236,9 @@ func (r *zkRegistry) getListener(conf *common.URL) (*RegistryConfigurationListen
dataListener
:=
r
.
dataListener
dataListener
.
mutex
.
Lock
()
defer
dataListener
.
mutex
.
Unlock
()
if
r
.
dataListener
.
subscribed
[
conf
.
Key
()]
!=
nil
{
if
r
.
dataListener
.
subscribed
[
conf
.
Service
Key
()]
!=
nil
{
zkListener
,
_
:=
r
.
dataListener
.
subscribed
[
conf
.
Key
()]
.
(
*
RegistryConfigurationListener
)
zkListener
,
_
:=
r
.
dataListener
.
subscribed
[
conf
.
Service
Key
()]
.
(
*
RegistryConfigurationListener
)
if
zkListener
!=
nil
{
r
.
listenerLock
.
Lock
()
defer
r
.
listenerLock
.
Unlock
()
...
...
@@ -250,7 +250,7 @@ func (r *zkRegistry) getListener(conf *common.URL) (*RegistryConfigurationListen
}
}
zkListener
=
NewRegistryConfigurationListener
(
r
.
client
,
r
)
zkListener
=
NewRegistryConfigurationListener
(
r
.
client
,
r
,
conf
)
if
r
.
listener
==
nil
{
r
.
cltLock
.
Lock
()
client
:=
r
.
client
...
...
@@ -279,7 +279,7 @@ func (r *zkRegistry) getCloseListener(conf *common.URL) (*RegistryConfigurationL
var
zkListener
*
RegistryConfigurationListener
r
.
dataListener
.
mutex
.
Lock
()
configurationListener
:=
r
.
dataListener
.
subscribed
[
conf
.
Key
()]
configurationListener
:=
r
.
dataListener
.
subscribed
[
conf
.
Service
Key
()]
if
configurationListener
!=
nil
{
zkListener
,
_
:=
configurationListener
.
(
*
RegistryConfigurationListener
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment