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

Jump to bottom

Fix issue of metadata only registred to one nacos namespace (3.2.x) #13439

Merged
merged 4 commits into from
Nov 30, 2023
Merged

Fix issue of metadata only registred to one nacos namespace (3.2.x) #13439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4bde0ab
Fix nacos metadata namespace
Nov 30, 2023
0503427
Merge branch '3.2' into 3.2-fix-nacos-metadata
Nov 30, 2023
a9ca791
Fix code style
Nov 30, 2023
b548ab5
Merge branch '3.2' into 3.2-fix-nacos-metadata
namelessssssssssss Nov 30, 2023
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
2 changes: 2 additions & 0 deletions ...etadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,6 @@ public interface MetadataConstants {
String REPORT_CONSUMER_URL_KEY = "report-consumer-definition";

String PATH_SEPARATOR = "/";

String NAMESPACE_KEY = "namespace";
}
18 changes: 14 additions & 4 deletions ...o-metadata-api/src/main/java/org/apache/dubbo/metadata/report/MetadataReportInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.URLBuilder;
import org.apache.dubbo.common.resource.Disposable;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.config.MetadataReportConfig;
import org.apache.dubbo.metadata.report.support.NopMetadataReport;
import org.apache.dubbo.rpc.model.ApplicationModel;
Expand All @@ -35,6 +36,7 @@
import static org.apache.dubbo.common.constants.CommonConstants.PORT_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.REGISTRY_LOCAL_FILE_CACHE_ENABLED;
import static org.apache.dubbo.common.utils.StringUtils.isEmpty;
import static org.apache.dubbo.metadata.MetadataConstants.NAMESPACE_KEY;
import static org.apache.dubbo.metadata.report.support.Constants.METADATA_REPORT_KEY;

/**
Expand Down Expand Up @@ -102,16 +104,24 @@ private void init(MetadataReportConfig config, MetadataReportFactory metadataRep
url = url.addParameterIfAbsent(
REGISTRY_LOCAL_FILE_CACHE_ENABLED,
String.valueOf(applicationModel.getCurrentConfig().getEnableFileCache()));
String relatedRegistryId = isEmpty(config.getRegistry())
? (isEmpty(config.getId()) ? DEFAULT_KEY : config.getId())
: config.getRegistry();
// RegistryConfig registryConfig = applicationModel.getConfigManager().getRegistry(relatedRegistryId)
// .orElseThrow(() -> new IllegalStateException("Registry id " + relatedRegistryId + " does not
// exist."));
MetadataReport metadataReport = metadataReportFactory.getMetadataReport(url);
if (metadataReport != null) {
metadataReports.put(relatedRegistryId, metadataReport);
metadataReports.put(getRelatedRegistryId(config, url), metadataReport);
}
}

private String getRelatedRegistryId(MetadataReportConfig config, URL url) {
String relatedRegistryId = isEmpty(config.getRegistry())
? (isEmpty(config.getId()) ? DEFAULT_KEY : config.getId())
: config.getRegistry();
String namespace = url.getParameter(NAMESPACE_KEY);
if (!StringUtils.isEmpty(namespace)) {
relatedRegistryId += ":" + namespace;
}
return relatedRegistryId;
}

public Map<String, MetadataReport> getMetadataReports(boolean checked) {
Expand Down
6 changes: 5 additions & 1 deletion ...src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReportFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public abstract class AbstractMetadataReportFactory implements MetadataReportFac
@Override
public MetadataReport getMetadataReport(URL url) {
url = url.setPath(MetadataReport.class.getName()).removeParameters(EXPORT_KEY, REFER_KEY);
String key = url.toServiceString();
String key = toMetadataReportKey(url);

MetadataReport metadataReport = serviceStoreMap.get(key);
if (metadataReport != null) {
Expand Down Expand Up @@ -88,6 +88,10 @@ public MetadataReport getMetadataReport(URL url) {
}
}

protected String toMetadataReportKey(URL url) {
return url.toServiceString();
}

@Override
public void destroy() {
lock.lock();
Expand Down
14 changes: 14 additions & 0 deletions ...nacos/src/main/java/org/apache/dubbo/metadata/store/nacos/NacosMetadataReportFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@
package org.apache.dubbo.metadata.store.nacos;

import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.metadata.report.MetadataReport;
import org.apache.dubbo.metadata.report.support.AbstractMetadataReportFactory;

import static org.apache.dubbo.metadata.MetadataConstants.NAMESPACE_KEY;

/**
* metadata report factory impl for nacos
*/
Expand All @@ -28,4 +31,15 @@ public class NacosMetadataReportFactory extends AbstractMetadataReportFactory {
protected MetadataReport createMetadataReport(URL url) {
return new NacosMetadataReport(url);
}

@Override
protected String toMetadataReportKey(URL url) {
String namespace = url.getParameter(NAMESPACE_KEY);
if (!StringUtils.isEmpty(namespace)) {
return URL.valueOf(url.toServiceString())
.addParameter(NAMESPACE_KEY, namespace)
.toString();
}
return super.toMetadataReportKey(url);
}
}
Loading