natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix curator5 and metadata (#9535)

This commit is contained in:
ken.lj 2022-01-06 17:24:44 +08:00 committed by GitHub
parent dd86898dad
commit 1700df36d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dubbo-compatible/pom.xml
View File

@ -43,11 +43,6 @@
<artifactId>dubbo-remoting-zookeeper</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-remoting-zookeeper-curator5</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc-rest</artifactId>

6
dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
View File

@ -571,7 +571,11 @@ public class ServiceConfig<T> extends ServiceConfigBase<T> {
if (!isGeneric(generic) && !isMetadataService(interfaceName)) {
ServiceDescriptor descriptor = getScopeModel().getServiceRepository().getService(interfaceName);
if (descriptor != null) {
MetadataUtils.publishServiceDefinition(getScopeModel().getServiceRepository().getService(interfaceName), getApplicationModel());
MetadataUtils.publishServiceDefinition(
getScopeModel().getServiceRepository().getService(interfaceName),
version == null ? "" : version,
group == null ? "" : group,
getApplicationModel());
}
}
}

10
dubbo-configcenter/dubbo-configcenter-zookeeper/pom.xml
View File

@ -38,11 +38,11 @@
<artifactId>dubbo-remoting-zookeeper</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-remoting-zookeeper-curator5</artifactId>
<version>${project.parent.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.dubbo</groupId>-->
<!-- <artifactId>dubbo-remoting-zookeeper-curator5</artifactId>-->
<!-- <version>${project.parent.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.apache.dubbo</groupId>

4
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataUtils.java
View File

@ -63,7 +63,7 @@ public class MetadataUtils {
return metadataServiceProxies.computeIfAbsent(computeKey(instance), k -> referProxy(k, instance));
}
public static void publishServiceDefinition(ServiceDescriptor serviceDescriptor, ApplicationModel applicationModel) {
public static void publishServiceDefinition(ServiceDescriptor serviceDescriptor, String version, String group, ApplicationModel applicationModel) {
if (getMetadataReports(applicationModel).size() == 0) {
String msg = "Remote Metadata Report Server not hasn't been configured or unavailable . Unable to get Metadata from remote!";
logger.warn(msg);
@ -77,7 +77,7 @@ public class MetadataUtils {
for (Map.Entry<String, MetadataReport> entry : getMetadataReports(applicationModel).entrySet()) {
MetadataReport metadataReport = entry.getValue();
metadataReport.storeProviderMetadata(new MetadataIdentifier(serviceName,
"", "",
version, group,
PROVIDER_SIDE, applicationModel.getApplicationName()), serviceDefinition);
}
return;