Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update initial mapping apps of service discovery MappingListener #14851

Merged
merged 1 commit into from
Nov 7, 2024
Merged

Update initial mapping apps of service discovery MappingListener #14851

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions ...registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,12 @@ public void doSubscribe(URL url, NotifyListener listener) {
mappingLock.lock();
mappingByUrl = serviceNameMapping.getMapping(url);
try {
MappingListener mappingListener = new DefaultMappingListener(url, mappingByUrl, listener);
DefaultMappingListener mappingListener = new DefaultMappingListener(url, mappingByUrl, listener);
mappingByUrl = serviceNameMapping.getAndListen(this.getUrl(), url, mappingListener);
// update the initial mapping apps we started to listen, to make sure it reflects the real value
// used do subscription before any event.
// it's protected by the mapping lock, so it won't override the event value.
mappingListener.updateInitialApps(mappingByUrl);
synchronized (mappingListeners) {
mappingListeners
.computeIfAbsent(url.getProtocolServiceKey(), (k) -> new ConcurrentHashSet<>())
Expand Down Expand Up @@ -399,8 +403,8 @@ public Map<String, ServiceInstancesChangedListener> getServiceListeners() {
private class DefaultMappingListener implements MappingListener {
private final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(DefaultMappingListener.class);
private final URL url;
private Set<String> oldApps;
private NotifyListener listener;
private final NotifyListener listener;
private volatile Set<String> oldApps;
private volatile boolean stopped;

public DefaultMappingListener(URL subscribedURL, Set<String> serviceNames, NotifyListener listener) {
Expand All @@ -424,16 +428,15 @@ public synchronized void onEvent(MappingChangedEvent event) {
Set<String> newApps = event.getApps();
Set<String> tempOldApps = oldApps;

if (CollectionUtils.isEmpty(newApps) || CollectionUtils.equals(newApps, tempOldApps)) {
return;
}

logger.info(
"Mapping of service " + event.getServiceKey() + "changed from " + tempOldApps + " to " + newApps);

Lock mappingLock = serviceNameMapping.getMappingLock(event.getServiceKey());
try {
mappingLock.lock();
if (CollectionUtils.isEmpty(newApps) || CollectionUtils.equals(newApps, tempOldApps)) {
return;
}
logger.info("Mapping of service " + event.getServiceKey() + "changed from " + tempOldApps + " to "
+ newApps);

if (CollectionUtils.isEmpty(tempOldApps) && !newApps.isEmpty()) {
serviceNameMapping.putCachedMapping(ServiceNameMapping.buildMappingKey(url), newApps);
subscribeURLs(url, listener, newApps);
Expand Down Expand Up @@ -478,6 +481,14 @@ protected NotifyListener getListener() {
return listener;
}

// writing of oldApps is protected by mapping lock to guarantee sequence consistency.
public void updateInitialApps(Set<String> oldApps) {
if (oldApps != null && !CollectionUtils.equals(oldApps, this.oldApps)) {
this.oldApps = oldApps;
logger.info("Update initial mapping apps from " + this.oldApps + " to " + oldApps);
}
}

@Override
public void stop() {
stopped = true;
Expand Down
Loading