Merge branch 'master' into rocketmq

# Conflicts:
#	spring-cloud-alibaba-docs/src/main/asciidoc-zh/rocketmq-new.adoc
pull/2217/head
zkzlx 4 years ago
commit 79f986b4c6

@ -21,7 +21,7 @@
<revision>2.2.6-SNAPSHOT</revision> <revision>2.2.6-SNAPSHOT</revision>
<sentinel.version>1.8.1</sentinel.version> <sentinel.version>1.8.1</sentinel.version>
<seata.version>1.3.0</seata.version> <seata.version>1.3.0</seata.version>
<nacos.client.version>1.4.1</nacos.client.version> <nacos.client.version>1.4.2</nacos.client.version>
<nacos.config.version>0.8.0</nacos.config.version> <nacos.config.version>0.8.0</nacos.config.version>
<spring.context.support.version>1.0.10</spring.context.support.version> <spring.context.support.version>1.0.10</spring.context.support.version>

@ -260,7 +260,7 @@ Nacos 内部有 https://nacos.io/zh-cn/docs/concepts.html[Namespace 的概念]:
[quote] [quote]
用于进行租户粒度的配置隔离。不同的命名空间下,可以存在相同的 Group 或 Data ID 的配置。Namespace 的常用场景之一是不同环境的配置的区分隔离,例如开发测试环境和生产环境的资源(如配置、服务)隔离等。 用于进行租户粒度的配置隔离。不同的命名空间下,可以存在相同的 Group 或 Data ID 的配置。Namespace 的常用场景之一是不同环境的配置的区分隔离,例如开发测试环境和生产环境的资源(如配置、服务)隔离等。
在没有明确指定 `${spring.cloud.nacos.config.namespace}` 配置的情况下, 默认使用的是 Nacos 上 Public 这个namespae。如果需要使用自定义的命名空间可以通过以下配置来实现 在没有明确指定 `${spring.cloud.nacos.config.namespace}` 配置的情况下, 默认使用的是 Nacos 上 Public 这个namespace。如果需要使用自定义的命名空间可以通过以下配置来实现
[source,properties] [source,properties]
---- ----
spring.cloud.nacos.config.namespace=b3404bc0-d7dc-4855-b519-570ed34b62d7 spring.cloud.nacos.config.namespace=b3404bc0-d7dc-4855-b519-570ed34b62d7
@ -348,7 +348,13 @@ Nacos Config 目前提供了三种配置能力从 Nacos 拉取相关的配置
* B: 通过 `spring.cloud.nacos.config.ext-config[n].data-id` 的方式支持多个扩展 Data Id 的配置 * B: 通过 `spring.cloud.nacos.config.ext-config[n].data-id` 的方式支持多个扩展 Data Id 的配置
* C: 通过内部相关规则(应用名、应用名+ Profile )自动生成相关的 Data Id 配置 * C: 通过内部相关规则(应用名、应用名+ Profile )自动生成相关的 Data Id 配置
当三种方式共同使用时,他们的一个优先级关系是:A < B < C 当三种方式共同使用时,他们的一个优先级关系是:
->A为优先级最高的
->B的优先级低于A
->C的优先级是最低的
=== Nacos Config 对外暴露的 Endpoint === Nacos Config 对外暴露的 Endpoint

@ -291,6 +291,17 @@ Endpoint 暴露的 json 中包含了两种属性:
} }
---- ----
=== 如何开启权重路由
==== Ribbon
.application.properties
[source,properties]
----
[service_name].ribbon.NFLoadBalancerRuleClassName=com.alibaba.cloud.nacos.ribbon.NacosRule
----
=== 关于 Nacos Discovery Starter 更多的配置项信息 === 关于 Nacos Discovery Starter 更多的配置项信息
更多关于 Nacos Discovery Starter 的配置项如下所示: 更多关于 Nacos Discovery Starter 的配置项如下所示:

@ -1,4 +1,4 @@
== Spring Cloud Alibaba RocketMQ Binder == Spring Cloud Alibaba RocketMQ Binder (NEW)
=== RocketMQ 介绍 === RocketMQ 介绍
@ -115,7 +115,7 @@ messageChannel.send(MessageBuilder.withPayload("simple msg").build());
**Spring Cloud Stream 底层基于这段代码去做了各种抽象。** **Spring Cloud Stream 底层基于这段代码去做了各种抽象。**
=== 如何使用 Spring Cloud Alibaba RocketMQ Binder ### === 如何使用 Spring Cloud Alibaba RocketMQ Binder
如果要在您的项目中引入 RocketMQ Binder需要引入如下 maven 依赖: 如果要在您的项目中引入 RocketMQ Binder需要引入如下 maven 依赖:

@ -19,6 +19,8 @@ include::sentinel.adoc[]
include::dubbo.adoc[] include::dubbo.adoc[]
include::rocketmq-new.adoc[]
include::rocketmq.adoc[] include::rocketmq.adoc[]
include::ans.adoc[] include::ans.adoc[]

@ -294,6 +294,16 @@ The followings shows how a service instance accesses the Endpoint:
} }
---- ----
=== Weight Route
==== Ribbon
.application.properties
[source,properties]
----
[service_name].ribbon.NFLoadBalancerRuleClassName=com.alibaba.cloud.nacos.ribbon.NacosRule
----
=== More Information about Nacos Discovery Starter Configurations === More Information about Nacos Discovery Starter Configurations
The following shows the other configurations of the starter of Nacos Discovery: The following shows the other configurations of the starter of Nacos Discovery:

@ -57,7 +57,7 @@ Send messages:
sh bin/tools.sh org.apache.rocketmq.example.quickstart.Producer sh bin/tools.sh org.apache.rocketmq.example.quickstart.Producer
``` ```
Output when the message is successfuly sent: `SendResult [sendStatus=SEND_OK, msgId= ...` Output when the message is successfully sent: `SendResult [sendStatus=SEND_OK, msgId= ...`
Receive messages: Receive messages:

@ -82,7 +82,7 @@ Job Description Empty
Custom Parameters Empty Custom Parameters Empty
---- ----
The job above is a “Simple Single-Server Job”, and speficied a Cron expression of "0 * * * * ?" . This means that the job will be executed once and once only in every minute. The job above is a “Simple Single-Server Job”, and specified a Cron expression of "0 * * * * ?" . This means that the job will be executed once and once only in every minute.
For more job types, refer to https://help.aliyun.com/document_detail/43136.html[SchedulerX Documentation]. For more job types, refer to https://help.aliyun.com/document_detail/43136.html[SchedulerX Documentation].

@ -18,18 +18,18 @@ spring.cloud.nacos.password=nacos
#spring.cloud.nacos.config.shared-data-ids=common.properties,base-common.properties #spring.cloud.nacos.config.shared-data-ids=common.properties,base-common.properties
## recommended. ## recommended.
spring.cloud.nacos.config.shared-configs[0].data-id= test2.yaml spring.cloud.nacos.config.shared-configs[0].data-id=test2.yaml
spring.cloud.nacos.config.shared-configs[0].refresh=true spring.cloud.nacos.config.shared-configs[0].refresh=true
## the default value is 'DEFAULT_GROUP' , if not specified. ## the default value is 'DEFAULT_GROUP' , if not specified.
spring.cloud.nacos.config.shared-configs[0].group= GROUP_APP1 spring.cloud.nacos.config.shared-configs[0].group=GROUP_APP1
## not recommended. ## not recommended.
#spring.cloud.nacos.config.ext-config[0]=ext.properties #spring.cloud.nacos.config.ext-config[0]=ext.properties
## recommended. ## recommended.
spring.cloud.nacos.config.extension-configs[0].data-id= extension1.properties spring.cloud.nacos.config.extension-configs[0].data-id=extension1.properties
spring.cloud.nacos.config.extension-configs[0].refresh=true spring.cloud.nacos.config.extension-configs[0].refresh=true
spring.cloud.nacos.config.extension-configs[1].data-id= test1.yml spring.cloud.nacos.config.extension-configs[1].data-id=test1.yml
spring.cloud.nacos.config.extension-configs[1].refresh= true spring.cloud.nacos.config.extension-configs[1].refresh=true

@ -2,6 +2,7 @@ spring.application.name=service-consumer
server.port=18083 server.port=18083
management.endpoints.web.exposure.include=* management.endpoints.web.exposure.include=*
spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
spring.cloud.nacos.discovery.fail-fast=true
spring.cloud.nacos.username=nacos spring.cloud.nacos.username=nacos
spring.cloud.nacos.password=nacos spring.cloud.nacos.password=nacos

@ -73,7 +73,7 @@ Provider端在application.properties文件中定义dubbo相关的配置比如
定义具体的服务: 定义具体的服务:
@Service( @DubboService(
version = "${foo.service.version}", version = "${foo.service.version}",
application = "${dubbo.application.id}", application = "${dubbo.application.id}",
protocol = "${dubbo.protocol.id}", protocol = "${dubbo.protocol.id}",
@ -111,7 +111,7 @@ Consumer端在服务调用之前先定义限流规则。
根据Provider端中发布的定义使用Dubbo的@Reference注解注入服务对应的Bean 根据Provider端中发布的定义使用Dubbo的@Reference注解注入服务对应的Bean
@Reference(version = "${foo.service.version}", application = "${dubbo.application.id}", @DubboReference(version = "${foo.service.version}", application = "${dubbo.application.id}",
path = "dubbo://localhost:12345", timeout = 30000) path = "dubbo://localhost:12345", timeout = 30000)
private FooService fooService; private FooService fooService;

@ -16,14 +16,14 @@
package com.alibaba.cloud.examples; package com.alibaba.cloud.examples;
import org.apache.dubbo.config.annotation.Reference; import org.apache.dubbo.config.annotation.DubboReference;
/** /**
* @author fangjian * @author fangjian
*/ */
public class FooServiceConsumer { public class FooServiceConsumer {
@Reference(version = "${foo.service.version}", @DubboReference(version = "${foo.service.version}",
application = "${dubbo.application.id}", application = "${dubbo.application.id}",
url = "dubbo://localhost:12345?version=1.0.0", timeout = 30000) url = "dubbo://localhost:12345?version=1.0.0", timeout = 30000)
private FooService fooService; private FooService fooService;

@ -16,12 +16,12 @@
package com.alibaba.cloud.examples; package com.alibaba.cloud.examples;
import org.apache.dubbo.config.annotation.Service; import org.apache.dubbo.config.annotation.DubboService;
/** /**
* @author fangjian * @author fangjian
*/ */
@Service(version = "${foo.service.version}", application = "${dubbo.application.id}", @DubboService(version = "${foo.service.version}", application = "${dubbo.application.id}",
protocol = "${dubbo.protocol.id}", registry = "${dubbo.registry.id}") protocol = "${dubbo.protocol.id}", registry = "${dubbo.registry.id}")
public class FooServiceImpl implements FooService { public class FooServiceImpl implements FooService {

@ -10,7 +10,6 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-dubbo-client-sample</artifactId> <artifactId>spring-cloud-dubbo-client-sample</artifactId>
<name>Spring Cloud Dubbo Client Sample</name> <name>Spring Cloud Dubbo Client Sample</name>

@ -12,7 +12,11 @@ spring:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
cloud: cloud:
nacos: nacos:
username: nacos
password: nacos
discovery: discovery:
username: nacos
password: nacos
server-addr: 127.0.0.1:8848 server-addr: 127.0.0.1:8848
namespace: public
server:
port: 8080

@ -1,4 +1,6 @@
dubbo: dubbo:
cloud:
subscribed-services: ${spring.application.name}
scan: scan:
base-packages: com.alibaba.cloud.dubbo.bootstrap base-packages: com.alibaba.cloud.dubbo.bootstrap
protocol: protocol:

@ -132,7 +132,6 @@ public class DataSourcePropertiesConfiguration {
if (!ObjectUtils.isEmpty(field.get(this))) { if (!ObjectUtils.isEmpty(field.get(this))) {
return field.getName(); return field.getName();
} }
return null;
} }
catch (IllegalAccessException e) { catch (IllegalAccessException e) {
// won't happen // won't happen

@ -86,9 +86,8 @@ public abstract class SentinelConverter<T extends Object>
}); });
for (Object obj : sourceArray) { for (Object obj : sourceArray) {
String item = null;
try { try {
item = objectMapper.writeValueAsString(obj); String item = objectMapper.writeValueAsString(obj);
Optional.ofNullable(convertRule(item)) Optional.ofNullable(convertRule(item))
.ifPresent(convertRule -> ruleCollection.add(convertRule)); .ifPresent(convertRule -> ruleCollection.add(convertRule));
} }

@ -60,9 +60,14 @@ public class NacosDataSourceFactoryBean implements FactoryBean<NacosDataSource>
properties.setProperty(PropertyKeyConst.SERVER_ADDR, this.serverAddr); properties.setProperty(PropertyKeyConst.SERVER_ADDR, this.serverAddr);
} }
else { else {
properties.setProperty(PropertyKeyConst.ENDPOINT, this.endpoint);
}
if (!StringUtils.isEmpty(this.accessKey)) {
properties.setProperty(PropertyKeyConst.ACCESS_KEY, this.accessKey); properties.setProperty(PropertyKeyConst.ACCESS_KEY, this.accessKey);
}
if (!StringUtils.isEmpty(this.secretKey)) {
properties.setProperty(PropertyKeyConst.SECRET_KEY, this.secretKey); properties.setProperty(PropertyKeyConst.SECRET_KEY, this.secretKey);
properties.setProperty(PropertyKeyConst.ENDPOINT, this.endpoint);
} }
if (!StringUtils.isEmpty(this.namespace)) { if (!StringUtils.isEmpty(this.namespace)) {
properties.setProperty(PropertyKeyConst.NAMESPACE, this.namespace); properties.setProperty(PropertyKeyConst.NAMESPACE, this.namespace);

@ -32,6 +32,16 @@ public class NacosConfigHealthIndicator extends AbstractHealthIndicator {
private final ConfigService configService; private final ConfigService configService;
/**
* status up .
*/
private final String STATUS_UP = "UP";
/**
* status down .
*/
private final String STATUS_DOWN = "DOWN";
public NacosConfigHealthIndicator(ConfigService configService) { public NacosConfigHealthIndicator(ConfigService configService) {
this.configService = configService; this.configService = configService;
} }
@ -43,10 +53,10 @@ public class NacosConfigHealthIndicator extends AbstractHealthIndicator {
// Set the status to Builder // Set the status to Builder
builder.status(status); builder.status(status);
switch (status) { switch (status) {
case "UP": case STATUS_UP:
builder.up(); builder.up();
break; break;
case "DOWN": case STATUS_DOWN:
builder.down(); builder.down();
break; break;
default: default:

@ -207,6 +207,12 @@ public class NacosDiscoveryProperties {
*/ */
private boolean ephemeral = true; private boolean ephemeral = true;
/**
* Throw exceptions during service registration if true, otherwise, log error
* (defaults to true).
*/
private boolean failFast = true;
@Autowired @Autowired
private InetUtils inetUtils; private InetUtils inetUtils;
@ -486,6 +492,14 @@ public class NacosDiscoveryProperties {
this.ephemeral = ephemeral; this.ephemeral = ephemeral;
} }
public boolean isFailFast() {
return failFast;
}
public void setFailFast(boolean failFast) {
this.failFast = failFast;
}
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) { if (this == o) {
@ -510,6 +524,7 @@ public class NacosDiscoveryProperties {
&& Objects.equals(secretKey, that.secretKey) && Objects.equals(secretKey, that.secretKey)
&& Objects.equals(heartBeatInterval, that.heartBeatInterval) && Objects.equals(heartBeatInterval, that.heartBeatInterval)
&& Objects.equals(heartBeatTimeout, that.heartBeatTimeout) && Objects.equals(heartBeatTimeout, that.heartBeatTimeout)
&& Objects.equals(failFast, that.failFast)
&& Objects.equals(ipDeleteTimeout, that.ipDeleteTimeout); && Objects.equals(ipDeleteTimeout, that.ipDeleteTimeout);
} }
@ -519,7 +534,7 @@ public class NacosDiscoveryProperties {
watchDelay, logName, service, weight, clusterName, group, watchDelay, logName, service, weight, clusterName, group,
namingLoadCacheAtStart, registerEnabled, ip, networkInterface, port, namingLoadCacheAtStart, registerEnabled, ip, networkInterface, port,
secure, accessKey, secretKey, heartBeatInterval, heartBeatTimeout, secure, accessKey, secretKey, heartBeatInterval, heartBeatTimeout,
ipDeleteTimeout, instanceEnabled, ephemeral); ipDeleteTimeout, instanceEnabled, ephemeral, failFast);
} }
@Override @Override
@ -535,7 +550,7 @@ public class NacosDiscoveryProperties {
+ ", port=" + port + ", secure=" + secure + ", accessKey='" + accessKey + ", port=" + port + ", secure=" + secure + ", accessKey='" + accessKey
+ '\'' + ", secretKey='" + secretKey + '\'' + ", heartBeatInterval=" + '\'' + ", secretKey='" + secretKey + '\'' + ", heartBeatInterval="
+ heartBeatInterval + ", heartBeatTimeout=" + heartBeatTimeout + heartBeatInterval + ", heartBeatTimeout=" + heartBeatTimeout
+ ", ipDeleteTimeout=" + ipDeleteTimeout + '}'; + ", ipDeleteTimeout=" + ipDeleteTimeout + ", failFast=" + failFast + '}';
} }
public void overrideFromEnv(Environment env) { public void overrideFromEnv(Environment env) {

@ -112,9 +112,14 @@ public class NacosServiceManager {
} }
public void nacosServiceShutDown() throws NacosException { public void nacosServiceShutDown() throws NacosException {
this.namingService.shutDown(); if (Objects.nonNull(this.namingService)) {
namingService = null; this.namingService.shutDown();
namingMaintainService = null; this.namingService = null;
}
if (Objects.nonNull(this.namingMaintainService)) {
this.namingMaintainService.shutDown();
this.namingMaintainService = null;
}
} }
@EventListener @EventListener

@ -20,7 +20,6 @@ import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.NacosServiceManager; import com.alibaba.cloud.nacos.NacosServiceManager;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@ -32,7 +31,6 @@ import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration; import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
/** /**
* @author xiaojing * @author xiaojing
@ -58,10 +56,8 @@ public class NacosDiscoveryClientConfiguration {
@ConditionalOnProperty(value = "spring.cloud.nacos.discovery.watch.enabled", @ConditionalOnProperty(value = "spring.cloud.nacos.discovery.watch.enabled",
matchIfMissing = true) matchIfMissing = true)
public NacosWatch nacosWatch(NacosServiceManager nacosServiceManager, public NacosWatch nacosWatch(NacosServiceManager nacosServiceManager,
NacosDiscoveryProperties nacosDiscoveryProperties, NacosDiscoveryProperties nacosDiscoveryProperties) {
ObjectProvider<ThreadPoolTaskScheduler> taskExecutorObjectProvider) { return new NacosWatch(nacosServiceManager, nacosDiscoveryProperties);
return new NacosWatch(nacosServiceManager, nacosDiscoveryProperties,
taskExecutorObjectProvider);
} }
} }

@ -66,6 +66,14 @@ public class NacosWatch implements ApplicationEventPublisherAware, SmartLifecycl
private final ThreadPoolTaskScheduler taskScheduler; private final ThreadPoolTaskScheduler taskScheduler;
public NacosWatch(NacosServiceManager nacosServiceManager,
NacosDiscoveryProperties properties) {
this.nacosServiceManager = nacosServiceManager;
this.properties = properties;
this.taskScheduler = getTaskScheduler();
}
@Deprecated
public NacosWatch(NacosServiceManager nacosServiceManager, public NacosWatch(NacosServiceManager nacosServiceManager,
NacosDiscoveryProperties properties, NacosDiscoveryProperties properties,
ObjectProvider<ThreadPoolTaskScheduler> taskScheduler) { ObjectProvider<ThreadPoolTaskScheduler> taskScheduler) {

@ -31,6 +31,16 @@ import org.springframework.boot.actuate.health.HealthIndicator;
*/ */
public class NacosDiscoveryHealthIndicator extends AbstractHealthIndicator { public class NacosDiscoveryHealthIndicator extends AbstractHealthIndicator {
/**
* status up.
*/
private static final String STATUS_UP = "UP";
/**
* status down.
*/
private static final String STATUS_DOWN = "DOWN";
private final NamingService namingService; private final NamingService namingService;
public NacosDiscoveryHealthIndicator(NamingService namingService) { public NacosDiscoveryHealthIndicator(NamingService namingService) {
@ -44,10 +54,10 @@ public class NacosDiscoveryHealthIndicator extends AbstractHealthIndicator {
// Set the status to Builder // Set the status to Builder
builder.status(status); builder.status(status);
switch (status) { switch (status) {
case "UP": case STATUS_UP:
builder.up(); builder.up();
break; break;
case "DOWN": case STATUS_DOWN:
builder.down(); builder.down();
break; break;
default: default:

@ -76,11 +76,15 @@ public class NacosServiceRegistry implements ServiceRegistry<Registration> {
instance.getIp(), instance.getPort()); instance.getIp(), instance.getPort());
} }
catch (Exception e) { catch (Exception e) {
log.error("nacos registry, {} register failed...{},", serviceId, if (nacosDiscoveryProperties.isFailFast()) {
registration.toString(), e); log.error("nacos registry, {} register failed...{},", serviceId,
// rethrow a RuntimeException if the registration is failed. registration.toString(), e);
// issue : https://github.com/alibaba/spring-cloud-alibaba/issues/1132 rethrowRuntimeException(e);
rethrowRuntimeException(e); }
else {
log.warn("Failfast is false. {} register failed...{},", serviceId,
registration.toString(), e);
}
} }
} }
@ -155,8 +159,10 @@ public class NacosServiceRegistry implements ServiceRegistry<Registration> {
public Object getStatus(Registration registration) { public Object getStatus(Registration registration) {
String serviceName = registration.getServiceId(); String serviceName = registration.getServiceId();
String group = nacosDiscoveryProperties.getGroup();
try { try {
List<Instance> instances = namingService().getAllInstances(serviceName); List<Instance> instances = namingService().getAllInstances(serviceName,
group);
for (Instance instance : instances) { for (Instance instance : instances) {
if (instance.getIp().equalsIgnoreCase(nacosDiscoveryProperties.getIp()) if (instance.getIp().equalsIgnoreCase(nacosDiscoveryProperties.getIp())
&& instance.getPort() == nacosDiscoveryProperties.getPort()) { && instance.getPort() == nacosDiscoveryProperties.getPort()) {

@ -86,13 +86,23 @@ public class SentinelProtectInterceptor implements ClientHttpRequestInterceptor
Tracer.trace( Tracer.trace(
new IllegalStateException("RestTemplate ErrorHandler has error")); new IllegalStateException("RestTemplate ErrorHandler has error"));
} }
return response;
} }
catch (Throwable e) { catch (Throwable e) {
if (!BlockException.isBlockException(e)) { if (BlockException.isBlockException(e)) {
Tracer.trace(e); return handleBlockException(request, body, execution, (BlockException) e);
} }
else { else {
return handleBlockException(request, body, execution, (BlockException) e); Tracer.traceEntry(e, hostEntry);
if (e instanceof IOException) {
throw (IOException) e;
}
else if (e instanceof RuntimeException) {
throw (RuntimeException) e;
}
else {
throw new IOException(e);
}
} }
} }
finally { finally {
@ -103,7 +113,6 @@ public class SentinelProtectInterceptor implements ClientHttpRequestInterceptor
hostEntry.exit(); hostEntry.exit();
} }
} }
return response;
} }
private ClientHttpResponse handleBlockException(HttpRequest request, byte[] body, private ClientHttpResponse handleBlockException(HttpRequest request, byte[] body,

@ -80,34 +80,37 @@ public final class SentinelFeign {
// using reflect get fallback and fallbackFactory properties from // using reflect get fallback and fallbackFactory properties from
// FeignClientFactoryBean because FeignClientFactoryBean is a package // FeignClientFactoryBean because FeignClientFactoryBean is a package
// level class, we can not use it in our package // level class, we can not use it in our package
Object feignClientFactoryBean = Builder.this.applicationContext Object feignClientFactoryBean = SentinelTargeterAspect
.getBean("&" + target.type().getName()); .getFeignClientFactoryBean();
Class fallback = (Class) getFieldValue(feignClientFactoryBean, if (feignClientFactoryBean != null) {
"fallback"); Class fallback = (Class) getFieldValue(feignClientFactoryBean,
Class fallbackFactory = (Class) getFieldValue(feignClientFactoryBean, "fallback");
"fallbackFactory"); Class fallbackFactory = (Class) getFieldValue(
String beanName = (String) getFieldValue(feignClientFactoryBean, feignClientFactoryBean, "fallbackFactory");
"contextId"); String beanName = (String) getFieldValue(feignClientFactoryBean,
if (!StringUtils.hasText(beanName)) { "contextId");
beanName = (String) getFieldValue(feignClientFactoryBean, "name"); if (!StringUtils.hasText(beanName)) {
} beanName = (String) getFieldValue(feignClientFactoryBean,
"name");
Object fallbackInstance; }
FallbackFactory fallbackFactoryInstance;
// check fallback and fallbackFactory properties Object fallbackInstance;
if (void.class != fallback) { FallbackFactory fallbackFactoryInstance;
fallbackInstance = getFromContext(beanName, "fallback", fallback, // check fallback and fallbackFactory properties
target.type()); if (void.class != fallback) {
return new SentinelInvocationHandler(target, dispatch, fallbackInstance = getFromContext(beanName, "fallback",
new FallbackFactory.Default(fallbackInstance)); fallback, target.type());
} return new SentinelInvocationHandler(target, dispatch,
if (void.class != fallbackFactory) { new FallbackFactory.Default(fallbackInstance));
fallbackFactoryInstance = (FallbackFactory) getFromContext( }
beanName, "fallbackFactory", fallbackFactory, if (void.class != fallbackFactory) {
FallbackFactory.class); fallbackFactoryInstance = (FallbackFactory) getFromContext(
return new SentinelInvocationHandler(target, dispatch, beanName, "fallbackFactory", fallbackFactory,
fallbackFactoryInstance); FallbackFactory.class);
return new SentinelInvocationHandler(target, dispatch,
fallbackFactoryInstance);
}
} }
return new SentinelInvocationHandler(target, dispatch); return new SentinelInvocationHandler(target, dispatch);
} }

@ -41,4 +41,11 @@ public class SentinelFeignAutoConfiguration {
return SentinelFeign.builder(); return SentinelFeign.builder();
} }
@Bean
@ConditionalOnProperty(name = "feign.sentinel.enabled")
@ConditionalOnClass(name = "org.springframework.cloud.openfeign.Targeter")
public SentinelTargeterAspect sentinelTargeterAspect() {
return new SentinelTargeterAspect();
}
} }

@ -109,7 +109,7 @@ public class SentinelInvocationHandler implements InvocationHandler {
catch (Throwable ex) { catch (Throwable ex) {
// fallback handle // fallback handle
if (!BlockException.isBlockException(ex)) { if (!BlockException.isBlockException(ex)) {
Tracer.trace(ex); Tracer.traceEntry(ex, entry);
} }
if (fallbackFactory != null) { if (fallbackFactory != null) {
try { try {

@ -0,0 +1,51 @@
/*
* Copyright 2013-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.cloud.sentinel.feign;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
/**
* Record FeignClientFactoryBean to threadlocal, so that SentinelFeign can get it when
* creating SentinelInvocationHandler.
*
* @see com.alibaba.cloud.sentinel.feign.SentinelFeign.Builder
* @author <a href="mailto:chenxilzx1@gmail.com">theonefx</a>
*/
@Aspect
public class SentinelTargeterAspect {
private static final ThreadLocal<Object> FEIGN_CLIENT_FACTORY_BEAN = new ThreadLocal<>();
public static Object getFeignClientFactoryBean() {
return FEIGN_CLIENT_FACTORY_BEAN.get();
}
@Around("execution(* org.springframework.cloud.openfeign.Targeter.target(..))")
public Object process(ProceedingJoinPoint pjp) throws Throwable {
Object factory = pjp.getArgs()[0];
try {
FEIGN_CLIENT_FACTORY_BEAN.set(factory);
return pjp.proceed();
}
finally {
FEIGN_CLIENT_FACTORY_BEAN.remove();
}
}
}

@ -17,6 +17,11 @@
<dependencies> <dependencies>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba-commons</artifactId>
</dependency>
<!-- Spring Boot dependencies --> <!-- Spring Boot dependencies -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>

@ -18,6 +18,7 @@ package com.alibaba.cloud.dubbo.autoconfigure;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -50,6 +51,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.serviceregistry.Registration; import org.springframework.cloud.client.serviceregistry.Registration;
import org.springframework.cloud.client.serviceregistry.ServiceRegistry; import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties;
import org.springframework.cloud.consul.serviceregistry.ConsulRegistration; import org.springframework.cloud.consul.serviceregistry.ConsulRegistration;
import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean; import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;
import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaAutoServiceRegistration; import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaAutoServiceRegistration;
@ -61,6 +63,7 @@ import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import org.springframework.context.event.EventListener; import org.springframework.context.event.EventListener;
import org.springframework.util.StringUtils;
import static com.alibaba.cloud.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration.CONSUL_AUTO_SERVICE_AUTO_CONFIGURATION_CLASS_NAME; import static com.alibaba.cloud.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration.CONSUL_AUTO_SERVICE_AUTO_CONFIGURATION_CLASS_NAME;
import static com.alibaba.cloud.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration.EUREKA_CLIENT_AUTO_CONFIGURATION_CLASS_NAME; import static com.alibaba.cloud.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration.EUREKA_CLIENT_AUTO_CONFIGURATION_CLASS_NAME;
@ -260,6 +263,9 @@ public class DubboServiceRegistrationAutoConfiguration {
@AutoConfigureOrder @AutoConfigureOrder
class ConsulConfiguration { class ConsulConfiguration {
@Autowired
private ConsulDiscoveryProperties consulDiscoveryProperties;
@EventListener(DubboBootstrapStartedEvent.class) @EventListener(DubboBootstrapStartedEvent.class)
public void attachURLsIntoMetadataBeforeReRegist( public void attachURLsIntoMetadataBeforeReRegist(
DubboBootstrapStartedEvent event) { DubboBootstrapStartedEvent event) {
@ -284,16 +290,40 @@ public class DubboServiceRegistrationAutoConfiguration {
})); }));
} }
@EventListener(ServiceInstancePreRegisteredEvent.class)
public void onServiceInstancePreRegistered(
ServiceInstancePreRegisteredEvent event) {
Registration registration = event.getSource();
attachURLsIntoMetadata((ConsulRegistration) registration);
}
private void attachURLsIntoMetadata(ConsulRegistration consulRegistration) { private void attachURLsIntoMetadata(ConsulRegistration consulRegistration) {
NewService newService = consulRegistration.getService();
Map<String, String> serviceMetadata = dubboServiceMetadataRepository Map<String, String> serviceMetadata = dubboServiceMetadataRepository
.getDubboMetadataServiceMetadata(); .getDubboMetadataServiceMetadata();
if (!isEmpty(serviceMetadata)) { if (isEmpty(serviceMetadata)) {
List<String> tags = newService.getTags(); return;
}
NewService newService = consulRegistration.getService();
if (consulDiscoveryProperties.isTagsAsMetadata()) {
for (Map.Entry<String, String> entry : serviceMetadata.entrySet()) { for (Map.Entry<String, String> entry : serviceMetadata.entrySet()) {
tags.add(entry.getKey() + "=" + entry.getValue()); attAsTag(newService.getTags(), entry.getKey(), entry.getValue());
}
}
else {
newService.getMeta().putAll(serviceMetadata);
}
}
private void attAsTag(List<String> tags, String key, String value) {
Iterator<String> iter = tags.iterator();
while (iter.hasNext()) {
String tag = iter.next();
String[] tmp = tag.split("=");
if (StringUtils.pathEquals(tmp[0], key)) {
iter.remove();
} }
} }
tags.add(key + "=" + value);
} }
} }

@ -0,0 +1,93 @@
/*
* Copyright 2013-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.cloud.dubbo.metadata;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Map;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.springframework.cloud.client.ServiceInstance;
import static com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository.EXPORTED_SERVICES_REVISION_PROPERTY_NAME;
import static java.nio.charset.StandardCharsets.UTF_8;
/**
* Copy from org.apache.dubbo.metadata.RevisionResolver.
*
* @author <a href="mailto:chenxilzx1@gmail.com">theonefx</a>
*/
public final class RevisionResolver {
/**
* The param key in url.
*/
public static final String SCA_REVSION_KEY = "sca_revision";
private static final String EMPTY_REVISION = "0";
private static final Logger logger = LoggerFactory.getLogger(RevisionResolver.class);
private static final char[] hexDigits = { '0', '1', '2', '3', '4', '5', '6', '7', '8',
'9', 'A', 'B', 'C', 'D', 'E', 'F' };
private static MessageDigest mdInst;
static {
try {
mdInst = MessageDigest.getInstance("MD5");
}
catch (NoSuchAlgorithmException e) {
logger.error("Failed to calculate metadata revision", e);
}
}
private RevisionResolver() {
}
public static String getEmptyRevision() {
return EMPTY_REVISION;
}
public static String calRevision(String metadata) {
mdInst.update(metadata.getBytes(UTF_8));
byte[] md5 = mdInst.digest();
int j = md5.length;
char[] str = new char[j * 2];
int k = 0;
for (byte byte0 : md5) {
str[k++] = hexDigits[byte0 >>> 4 & 0xf];
str[k++] = hexDigits[byte0 & 0xf];
}
return new String(str);
}
public static String getRevision(ServiceInstance instance) {
Map<String, String> metadata = instance.getMetadata();
String revision = metadata.get(EXPORTED_SERVICES_REVISION_PROPERTY_NAME);
if (revision == null) {
revision = RevisionResolver.getEmptyRevision();
}
return revision;
}
}

@ -0,0 +1,232 @@
/*
* Copyright 2013-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.cloud.dubbo.metadata;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.compiler.support.ClassUtils;
import org.apache.dubbo.common.utils.StringUtils;
import static org.apache.dubbo.common.constants.CommonConstants.GROUP_CHAR_SEPARATOR;
import static org.apache.dubbo.common.constants.CommonConstants.GROUP_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.INTERFACE_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.METHODS_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PID_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.TIMESTAMP_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY;
/**
* Copy from org.apache.dubbo.metadata.MetadataInfo.ServiceInfo.
*
* @author <a href="mailto:chenxilzx1@gmail.com">theonefx</a>
*/
public class ServiceInfo implements Serializable {
private static final long serialVersionUID = -258557978718735302L;
private String name;
private String group;
private String version;
private String protocol;
private String path; // most of the time, path is the same with the interface name.
private Map<String, String> params;
// params configured on consumer side,
private transient Map<String, String> consumerParams;
// service + group + version
private transient String serviceKey;
// service + group + version + protocol
private transient String matchKey;
private transient URL url;
private static final Set<String> IGNORE_KEYS = new HashSet<>();
static {
IGNORE_KEYS.add(TIMESTAMP_KEY);
IGNORE_KEYS.add(PID_KEY);
IGNORE_KEYS.add(INTERFACE_KEY);
IGNORE_KEYS.add(METHODS_KEY);
}
public ServiceInfo(URL url) {
this(url.getServiceInterface(), url.getParameter(GROUP_KEY),
url.getParameter(VERSION_KEY), url.getProtocol(), url.getPath(), null);
this.url = url;
Map<String, String> params = new TreeMap<>();
url.getParameters().forEach((k, v) -> {
if (IGNORE_KEYS.contains(k)) {
return;
}
params.put(k, v);
});
this.params = params;
}
public ServiceInfo(String name, String group, String version, String protocol,
String path, Map<String, String> params) {
this.name = name;
this.group = group;
this.version = version;
this.protocol = protocol;
this.path = path;
this.params = params == null ? new HashMap<>() : params;
this.serviceKey = URL.buildKey(name, group, version);
this.matchKey = buildMatchKey();
}
public String getMatchKey() {
if (matchKey != null) {
return matchKey;
}
buildMatchKey();
return matchKey;
}
private String buildMatchKey() {
matchKey = getServiceKey();
if (StringUtils.isNotEmpty(protocol)) {
matchKey = getServiceKey() + GROUP_CHAR_SEPARATOR + protocol;
}
return matchKey;
}
public String getServiceKey() {
if (serviceKey != null) {
return serviceKey;
}
this.serviceKey = URL.buildKey(name, group, version);
return serviceKey;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getGroup() {
return group;
}
public void setGroup(String group) {
this.group = group;
}
public String getVersion() {
return version;
}
public void setVersion(String version) {
this.version = version;
}
public String getPath() {
return path;
}
public void setPath(String path) {
this.path = path;
}
public Map<String, String> getParams() {
if (params == null) {
return Collections.emptyMap();
}
return params;
}
public void setParams(Map<String, String> params) {
this.params = params;
}
public String getParameter(String key) {
if (consumerParams != null) {
String value = consumerParams.get(key);
if (value != null) {
return value;
}
}
return params.get(key);
}
public String toDescString() {
return this.getMatchKey() + getMethodSignaturesString() + getParams();
}
private String getMethodSignaturesString() {
SortedSet<String> methodStrings = new TreeSet<>();
Method[] methods = ClassUtils.forName(name).getMethods();
for (Method method : methods) {
methodStrings.add(method.toString());
}
return methodStrings.toString();
}
public URL getUrl() {
return url;
}
@Override
public boolean equals(Object obj) {
if (obj == null) {
return false;
}
if (!(obj instanceof ServiceInfo)) {
return false;
}
ServiceInfo serviceInfo = (ServiceInfo) obj;
return this.getMatchKey().equals(serviceInfo.getMatchKey())
&& this.getParams().equals(serviceInfo.getParams());
}
@Override
public int hashCode() {
return Objects.hash(getMatchKey(), getParams());
}
@Override
public String toString() {
return "service{" + "name='" + name + "'," + "group='" + group + "',"
+ "version='" + version + "'," + "protocol='" + protocol + "',"
+ "params=" + params + "," + "consumerParams=" + consumerParams + "}";
}
}

@ -16,9 +16,11 @@
package com.alibaba.cloud.dubbo.metadata.repository; package com.alibaba.cloud.dubbo.metadata.repository;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
@ -31,6 +33,8 @@ import com.alibaba.cloud.dubbo.env.DubboCloudProperties;
import com.alibaba.cloud.dubbo.http.matcher.RequestMetadataMatcher; import com.alibaba.cloud.dubbo.http.matcher.RequestMetadataMatcher;
import com.alibaba.cloud.dubbo.metadata.DubboRestServiceMetadata; import com.alibaba.cloud.dubbo.metadata.DubboRestServiceMetadata;
import com.alibaba.cloud.dubbo.metadata.RequestMetadata; import com.alibaba.cloud.dubbo.metadata.RequestMetadata;
import com.alibaba.cloud.dubbo.metadata.RevisionResolver;
import com.alibaba.cloud.dubbo.metadata.ServiceInfo;
import com.alibaba.cloud.dubbo.metadata.ServiceRestMetadata; import com.alibaba.cloud.dubbo.metadata.ServiceRestMetadata;
import com.alibaba.cloud.dubbo.registry.event.SubscribedServicesChangedEvent; import com.alibaba.cloud.dubbo.registry.event.SubscribedServicesChangedEvent;
import com.alibaba.cloud.dubbo.service.DubboMetadataService; import com.alibaba.cloud.dubbo.service.DubboMetadataService;
@ -41,6 +45,8 @@ import com.alibaba.cloud.dubbo.util.JSONUtils;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.type.TypeFactory; import com.fasterxml.jackson.databind.type.TypeFactory;
import org.apache.dubbo.common.URL; import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -95,9 +101,10 @@ public class DubboServiceMetadataRepository
public static final String DUBBO_METADATA_SERVICE_URLS_PROPERTY_NAME = METADATA_SERVICE_URLS_PROPERTY_NAME; public static final String DUBBO_METADATA_SERVICE_URLS_PROPERTY_NAME = METADATA_SERVICE_URLS_PROPERTY_NAME;
/** /**
* The {@link String#format(String, Object...) pattern} of dubbo protocols port. * The key of dubbo metadata revision. copyed from
* ServiceInstanceMetadataUtils.EXPORTED_SERVICES_REVISION_PROPERTY_NAME.
*/ */
public static final String DUBBO_PROTOCOLS_PORT_PROPERTY_NAME_PATTERN = "dubbo.protocols.%s.port"; public static String EXPORTED_SERVICES_REVISION_PROPERTY_NAME = "dubbo.metadata.revision";
private final Logger logger = LoggerFactory.getLogger(getClass()); private final Logger logger = LoggerFactory.getLogger(getClass());
@ -115,14 +122,11 @@ public class DubboServiceMetadataRepository
*/ */
private final MultiValueMap<String, URL> allExportedURLs = new LinkedMultiValueMap<>(); private final MultiValueMap<String, URL> allExportedURLs = new LinkedMultiValueMap<>();
// =================================== Registration // ======================== Registration ======================== //
// =================================== //
// ==================================================================================== // ============================================================== //
// //
// =================================== Subscription // ======================== Subscription ======================== //
// =================================== //
/** /**
* A Map to store REST metadata temporary, its' key is the special service name for a * A Map to store REST metadata temporary, its' key is the special service name for a
* Dubbo service, the value is a JSON content of JAX-RS or Spring MVC REST metadata * Dubbo service, the value is a JSON content of JAX-RS or Spring MVC REST metadata
@ -132,24 +136,20 @@ public class DubboServiceMetadataRepository
private ApplicationEventPublisher applicationEventPublisher; private ApplicationEventPublisher applicationEventPublisher;
// ==================================================================================== // =============================================================== //
// //
// =================================== REST Metadata // ======================== REST Metadata ======================== //
// ================================== //
private volatile Set<String> subscribedServices = emptySet(); private volatile Set<String> subscribedServices = emptySet();
/** /**
* Key is application name Value is Map&lt;RequestMetadata, * Key is application name Value is Map&lt;RequestMetadata,
* DubboRestServiceMetadata&gt;. * DubboRestServiceMetadata&gt;.
*/ */
private Map<String, Map<RequestMetadataMatcher, DubboRestServiceMetadata>> dubboRestServiceMetadataRepository = newHashMap(); private final Map<String, Map<RequestMetadataMatcher, DubboRestServiceMetadata>> dubboRestServiceMetadataRepository = newHashMap();
// ==================================================================================== // =============================================================== //
// //
// =================================== Dependencies // ======================== Dependencies ========================= //
// =================================== //
@Autowired @Autowired
private DubboCloudProperties dubboCloudProperties; private DubboCloudProperties dubboCloudProperties;
@ -178,8 +178,7 @@ public class DubboServiceMetadataRepository
@Autowired @Autowired
private DubboMetadataServiceExporter dubboMetadataServiceExporter; private DubboMetadataServiceExporter dubboMetadataServiceExporter;
// ==================================================================================== // =============================================================== //
// //
private static <K, V> Map<K, V> getMap(Map<String, Map<K, V>> repository, private static <K, V> Map<K, V> getMap(Map<String, Map<K, V>> repository,
String key) { String key) {
@ -187,12 +186,7 @@ public class DubboServiceMetadataRepository
} }
private static <K, V> V getOrDefault(Map<K, V> source, K key, V defaultValue) { private static <K, V> V getOrDefault(Map<K, V> source, K key, V defaultValue) {
V value = source.get(key); return source.computeIfAbsent(key, k -> defaultValue);
if (value == null) {
value = defaultValue;
source.put(key, value);
}
return value;
} }
private static <K, V> Map<K, V> newHashMap() { private static <K, V> Map<K, V> newHashMap() {
@ -246,13 +240,14 @@ public class DubboServiceMetadataRepository
@Override @Override
public void afterSingletonsInstantiated() { public void afterSingletonsInstantiated() {
initializeMetadata(); // inited by DubboCloudRegistry.preInit() @theonefx
// initializeMetadata();
} }
/** /**
* Initialize the metadata. * Initialize the metadata.
*/ */
private void initializeMetadata() { public void initializeMetadata() {
doGetSubscribedServices().forEach(this::initializeMetadata); doGetSubscribedServices().forEach(this::initializeMetadata);
if (logger.isInfoEnabled()) { if (logger.isInfoEnabled()) {
logger.info("The metadata of Dubbo services has been initialized"); logger.info("The metadata of Dubbo services has been initialized");
@ -299,12 +294,36 @@ public class DubboServiceMetadataRepository
addDubboMetadataServiceURLsMetadata(metadata, dubboMetadataServiceURLs); addDubboMetadataServiceURLsMetadata(metadata, dubboMetadataServiceURLs);
addDubboProtocolsPortMetadata(metadata); addDubboProtocolsPortMetadata(metadata);
addRevision(metadata);
return Collections.unmodifiableMap(metadata); return Collections.unmodifiableMap(metadata);
} }
private void addRevision(Map<String, String> metadata) {
metadata.put(EXPORTED_SERVICES_REVISION_PROPERTY_NAME, calAndGetRevision());
}
public String calAndGetRevision() {
if (CollectionUtils.isEmptyMap(allExportedURLs)) {
return RevisionResolver.getEmptyRevision();
}
else {
List<String> descs = new ArrayList<>(allExportedURLs.size());
for (Map.Entry<String, List<URL>> entry : allExportedURLs.entrySet()) {
entry.getValue().stream().map(ServiceInfo::new)
.map(ServiceInfo::toDescString).forEach(descs::add);
}
descs.sort(String::compareTo);
return RevisionResolver.calRevision(descs.toString());
}
}
private void removeDubboMetadataServiceURLs(List<URL> dubboMetadataServiceURLs) { private void removeDubboMetadataServiceURLs(List<URL> dubboMetadataServiceURLs) {
dubboMetadataServiceURLs.forEach(this::unexportURL); dubboMetadataServiceURLs.stream().map(URL::getServiceKey).distinct()
.forEach(allExportedURLs::remove);
// dubboMetadataServiceURLs.forEach(this::unexportURL);
} }
private void addDubboMetadataServiceURLsMetadata(Map<String, String> metadata, private void addDubboMetadataServiceURLsMetadata(Map<String, String> metadata,
@ -404,8 +423,34 @@ public class DubboServiceMetadataRepository
public List<URL> getExportedURLs(String serviceInterface, String group, public List<URL> getExportedURLs(String serviceInterface, String group,
String version) { String version) {
String serviceKey = URL.buildKey(serviceInterface, group, version); if (group != null) {
return allExportedURLs.getOrDefault(serviceKey, Collections.emptyList()); List<URL> urls = new LinkedList<>();
if (CommonConstants.ANY_VALUE.equals(group)) {
String serviceKey = URL.buildKey(serviceInterface, group, version);
String expectKey = serviceKey.substring(2);
for (String key : allExportedURLs.keySet()) {
if (key.endsWith(expectKey)) {
urls.addAll(allExportedURLs.get(key));
}
}
}
else {
String[] groups = group.split(CommonConstants.COMMA_SEPARATOR);
for (String expectKey : groups) {
String serviceKey = URL.buildKey(serviceInterface, expectKey,
version);
List<URL> urlList = allExportedURLs.get(serviceKey);
if (urlList != null) {
urls.addAll(urlList);
}
}
}
return urls;
}
else {
String serviceKey = URL.buildKey(serviceInterface, null, version);
return allExportedURLs.getOrDefault(serviceKey, Collections.emptyList());
}
} }
/** /**

@ -0,0 +1,90 @@
/*
* Copyright 2013-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.cloud.dubbo.registry;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.registry.NotifyListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.dubbo.common.URLBuilder.from;
import static org.apache.dubbo.common.constants.RegistryConstants.CATEGORY_KEY;
import static org.apache.dubbo.common.constants.RegistryConstants.EMPTY_PROTOCOL;
import static org.apache.dubbo.common.utils.CollectionUtils.isEmpty;
/**
* @author <a href="mailto:chenxilzx1@gmail.com">theonefx</a>
*/
public abstract class AbstractServiceSubscribeHandler {
protected final Logger logger = LoggerFactory.getLogger(getClass());
protected final URL url;
protected final NotifyListener listener;
protected final DubboCloudRegistry registry;
public AbstractServiceSubscribeHandler(URL url, NotifyListener listener,
DubboCloudRegistry registry) {
this.url = url;
this.listener = listener;
this.registry = registry;
}
protected void notifyAllSubscribedURLs(URL url, List<URL> subscribedURLs,
NotifyListener listener) {
if (isEmpty(subscribedURLs)) {
// Add the EMPTY_PROTOCOL URL
listener.notify(Collections.singletonList(emptyURL(url)));
// if (isDubboMetadataServiceURL(url)) {
// if meta service change, and serviceInstances is zero, will clean up
// information about this client
// String serviceName = url.getParameter(GROUP_KEY);
// repository.removeMetadataAndInitializedService(serviceName, url);
// }
}
else {
// Notify all
listener.notify(subscribedURLs);
}
}
private URL emptyURL(URL url) {
// issue : When the last service provider is closed, the client still periodically
// connects to the last provider.n
// fix https://github.com/alibaba/spring-cloud-alibaba/issues/1259
return from(url).setProtocol(EMPTY_PROTOCOL).removeParameter(CATEGORY_KEY)
.build();
}
private final AtomicBoolean inited = new AtomicBoolean(false);
public void init() {
if (inited.compareAndSet(false, true)) {
doInit();
}
}
protected abstract void doInit();
}

@ -16,28 +16,27 @@
package com.alibaba.cloud.dubbo.registry; package com.alibaba.cloud.dubbo.registry;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.alibaba.cloud.commons.lang.StringUtils;
import com.alibaba.cloud.dubbo.metadata.RevisionResolver;
import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository; import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
import com.alibaba.cloud.dubbo.registry.event.ServiceInstancesChangedEvent; import com.alibaba.cloud.dubbo.registry.event.ServiceInstancesChangedEvent;
import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory;
import com.alibaba.cloud.dubbo.service.DubboMetadataService; import com.alibaba.cloud.dubbo.service.DubboMetadataService;
import com.alibaba.cloud.dubbo.service.DubboMetadataServiceProxy; import com.alibaba.cloud.dubbo.service.DubboMetadataServiceProxy;
import com.alibaba.cloud.dubbo.util.DubboMetadataUtils; import com.alibaba.cloud.dubbo.util.DubboMetadataUtils;
import com.alibaba.cloud.dubbo.util.JSONUtils; import com.alibaba.cloud.dubbo.util.JSONUtils;
import org.apache.dubbo.common.URL; import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.URLBuilder;
import org.apache.dubbo.registry.NotifyListener; import org.apache.dubbo.registry.NotifyListener;
import org.apache.dubbo.registry.support.FailbackRegistry; import org.apache.dubbo.registry.support.FailbackRegistry;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -47,23 +46,14 @@ import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.context.ApplicationListener; import org.springframework.context.ApplicationListener;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.Ordered;
import org.springframework.util.CollectionUtils;
import static java.lang.String.format;
import static java.util.Collections.emptyList; import static java.util.Collections.emptyList;
import static org.apache.dubbo.common.URLBuilder.from; import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER;
import static org.apache.dubbo.common.constants.CommonConstants.GROUP_KEY; import static org.apache.dubbo.common.constants.CommonConstants.GROUP_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PID_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PROTOCOL_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER; import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER;
import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER_SIDE; import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER_SIDE;
import static org.apache.dubbo.common.constants.CommonConstants.SIDE_KEY; import static org.apache.dubbo.common.constants.CommonConstants.SIDE_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.TIMESTAMP_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY;
import static org.apache.dubbo.common.constants.RegistryConstants.CATEGORY_KEY; import static org.apache.dubbo.common.constants.RegistryConstants.CATEGORY_KEY;
import static org.apache.dubbo.common.constants.RegistryConstants.EMPTY_PROTOCOL;
import static org.apache.dubbo.common.utils.CollectionUtils.isEmpty;
import static org.apache.dubbo.registry.Constants.ADMIN_PROTOCOL; import static org.apache.dubbo.registry.Constants.ADMIN_PROTOCOL;
import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataUtils.METADATA_SERVICE_URLS_PROPERTY_NAME; import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataUtils.METADATA_SERVICE_URLS_PROPERTY_NAME;
import static org.springframework.util.StringUtils.hasText; import static org.springframework.util.StringUtils.hasText;
@ -72,22 +62,14 @@ import static org.springframework.util.StringUtils.hasText;
* Dubbo Cloud {@link FailbackRegistry} is based on Spring Cloud {@link DiscoveryClient}. * Dubbo Cloud {@link FailbackRegistry} is based on Spring Cloud {@link DiscoveryClient}.
* *
* @author <a href="mailto:mercyblitz@gmail.com">Mercy</a> * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
* @author <a href="mailto:chenxilzx1@gmail.com">theonefx</a>
*/ */
public class DubboCloudRegistry extends FailbackRegistry { public class DubboCloudRegistry extends FailbackRegistry
implements ApplicationListener<ServiceInstancesChangedEvent> {
/**
* The parameter name of {@link #servicesLookupInterval}.
*/
public static final String SERVICES_LOOKUP_INTERVAL_PARAM_NAME = "dubbo.services.lookup.interval";
protected static final String DUBBO_METADATA_SERVICE_CLASS_NAME = DubboMetadataService.class protected static final String DUBBO_METADATA_SERVICE_CLASS_NAME = DubboMetadataService.class
.getName(); .getName();
/**
* Caches the IDs of {@link ApplicationListener}.
*/
private static final Set<String> REGISTER_LISTENERS = new HashSet<>();
protected final Logger logger = LoggerFactory.getLogger(getClass()); protected final Logger logger = LoggerFactory.getLogger(getClass());
private final DiscoveryClient discoveryClient; private final DiscoveryClient discoveryClient;
@ -98,334 +80,362 @@ public class DubboCloudRegistry extends FailbackRegistry {
private final JSONUtils jsonUtils; private final JSONUtils jsonUtils;
private final DubboGenericServiceFactory dubboGenericServiceFactory;
private final DubboMetadataUtils dubboMetadataUtils; private final DubboMetadataUtils dubboMetadataUtils;
/**
* The interval in second of lookup service names(only for Dubbo-OPS).
*/
private final long servicesLookupInterval;
private final ConfigurableApplicationContext applicationContext; private final ConfigurableApplicationContext applicationContext;
private final String currentApplicationName; private final ReSubscribeManager reSubscribeManager;
private final Map<URL, NotifyListener> urlNotifyListenerMap = new ConcurrentHashMap<>();
private final Map<String, ReSubscribeMetadataJob> reConnectJobMap = new ConcurrentHashMap<>(); private final AtomicBoolean inited = new AtomicBoolean(false);
private final ScheduledThreadPoolExecutor reConnectPool = new ScheduledThreadPoolExecutor( /**
2); * {subscribedURL : ServiceSubscribeHandler}.
*/
private final Map<URL, GenearalServiceSubscribeHandler> urlSubscribeHandlerMap = new ConcurrentHashMap<>();
private final int maxReSubscribeMetadataTimes; /**
* {appName: MetadataServiceSubscribeHandler}.
*/
private final Map<String, MetadataServiceSubscribeHandler> metadataSubscribeHandlerMap = new ConcurrentHashMap<>();
private final int reSubscribeMetadataIntervial; /**
* {appName : {revision: [instances]}}.
*/
private final Map<String, Map<String, List<ServiceInstance>>> serviceRevisionInstanceMap = new ConcurrentHashMap<>();
public DubboCloudRegistry(URL url, DiscoveryClient discoveryClient, public DubboCloudRegistry(URL url, DiscoveryClient discoveryClient,
DubboServiceMetadataRepository repository, DubboServiceMetadataRepository repository,
DubboMetadataServiceProxy dubboMetadataConfigServiceProxy, DubboMetadataServiceProxy dubboMetadataConfigServiceProxy,
JSONUtils jsonUtils, DubboGenericServiceFactory dubboGenericServiceFactory, JSONUtils jsonUtils, ConfigurableApplicationContext applicationContext) {
ConfigurableApplicationContext applicationContext,
int maxReSubscribeMetadataTimes, int reSubscribeMetadataIntervial) {
super(url); super(url);
this.servicesLookupInterval = url
.getParameter(SERVICES_LOOKUP_INTERVAL_PARAM_NAME, 60L);
this.discoveryClient = discoveryClient; this.discoveryClient = discoveryClient;
this.repository = repository; this.repository = repository;
this.dubboMetadataConfigServiceProxy = dubboMetadataConfigServiceProxy; this.dubboMetadataConfigServiceProxy = dubboMetadataConfigServiceProxy;
this.jsonUtils = jsonUtils; this.jsonUtils = jsonUtils;
this.dubboGenericServiceFactory = dubboGenericServiceFactory;
this.applicationContext = applicationContext; this.applicationContext = applicationContext;
this.dubboMetadataUtils = getBean(DubboMetadataUtils.class); this.dubboMetadataUtils = getBean(DubboMetadataUtils.class);
this.currentApplicationName = dubboMetadataUtils.getCurrentApplicationName(); this.reSubscribeManager = new ReSubscribeManager(this);
this.maxReSubscribeMetadataTimes = maxReSubscribeMetadataTimes; }
this.reSubscribeMetadataIntervial = reSubscribeMetadataIntervial;
private void preInit() {
if (inited.compareAndSet(false, true)) {
Set<String> subscribeApps = getServices(null);
for (String appName : subscribeApps) {
List<ServiceInstance> instances = discoveryClient.getInstances(appName);
Map<String, List<ServiceInstance>> map = serviceRevisionInstanceMap
.computeIfAbsent(appName, k -> new HashMap<>());
for (ServiceInstance instance : instances) {
String revision = RevisionResolver.getRevision(instance);
List<ServiceInstance> list = map.computeIfAbsent(revision,
k -> new ArrayList<>());
list.add(instance);
}
if (map.size() == 0) {
logger.debug("APP {} preInited, instance siez is zero!!", appName);
}
else {
map.forEach((revision, list) -> logger.debug(
"APP {} revision {} preInited, instance size = {}", appName,
revision, list.size()));
}
}
metadataSubscribeHandlerMap.forEach((url, handler) -> handler.init());
urlSubscribeHandlerMap.forEach((url, handler) -> handler.init());
repository.initializeMetadata();
reConnectPool.setKeepAliveTime(10, TimeUnit.MINUTES); // meke sure everything prepared, then can listening
reConnectPool.allowCoreThreadTimeOut(true); // ServiceInstanceChangeEvent
applicationContext.addApplicationListener(this);
logger.info("DubboCloudRegistry preInit Done.");
}
} }
private <T> T getBean(Class<T> beanClass) { protected <T> T getBean(Class<T> beanClass) {
return this.applicationContext.getBean(beanClass); return this.applicationContext.getBean(beanClass);
} }
protected boolean shouldRegister(URL url) { protected boolean shouldNotRegister(URL url) {
String side = url.getParameter(SIDE_KEY); String side = url.getParameter(SIDE_KEY);
boolean should = PROVIDER_SIDE.equals(side); // Only register the Provider. boolean should = PROVIDER_SIDE.equals(side); // Only register the Provider.
if (!should) { if (logger.isDebugEnabled()) {
if (logger.isDebugEnabled()) { if (!should) {
logger.debug("The URL[{}] should not be registered.", url.toString()); logger.debug("The URL should NOT!! be registered & unregistered [{}] .",
url);
}
else {
logger.debug("The URL should be registered & unregistered [{}] .", url);
} }
} }
return should; return !should;
} }
@Override @Override
public final void doRegister(URL url) { public final void doRegister(URL url) {
if (!shouldRegister(url)) { synchronized (this) {
return; preInit();
if (shouldNotRegister(url)) {
return;
}
repository.exportURL(url);
} }
repository.exportURL(url);
} }
@Override @Override
public final void doUnregister(URL url) { public final void doUnregister(URL url) {
if (!shouldRegister(url)) { synchronized (this) {
return; preInit();
if (shouldNotRegister(url)) {
return;
}
repository.unexportURL(url);
} }
repository.unexportURL(url);
} }
@Override @Override
public final void doSubscribe(URL url, NotifyListener listener) { public final void doSubscribe(URL url, NotifyListener listener) {
synchronized (this) {
if (isAdminURL(url)) { preInit();
// TODO in future if (isAdminURL(url)) {
if (logger.isWarnEnabled()) { // TODO in future
logger.warn("This feature about admin will be supported in the future."); if (logger.isWarnEnabled()) {
logger.warn(
"This feature about admin will be supported in the future.");
}
}
else if (isDubboMetadataServiceURL(url) && containsProviderCategory(url)) {
// for DubboMetadataService
String appName = getServiceName(url);
MetadataServiceSubscribeHandler handler = new MetadataServiceSubscribeHandler(
appName, url, listener, this, dubboMetadataUtils);
if (inited.get()) {
handler.init();
}
metadataSubscribeHandlerMap.put(appName, handler);
}
else if (isConsumerServiceURL(url)) {
// for general Dubbo Services
GenearalServiceSubscribeHandler handler = new GenearalServiceSubscribeHandler(
url, listener, this, repository, jsonUtils,
dubboMetadataConfigServiceProxy);
if (inited.get()) {
handler.init();
}
urlSubscribeHandlerMap.put(url, handler);
} }
}
else if (isDubboMetadataServiceURL(url)) { // for DubboMetadataService
subscribeDubboMetadataServiceURLs(url, listener);
}
else { // for general Dubbo Services
subscribeURLs(url, listener);
urlNotifyListenerMap.put(url, listener);
} }
} }
private void subscribeURLs(URL url, NotifyListener listener) { /**
* Process ServiceInstanceChangedEvent, refresh dubbo reference and metadata info.
// Sync subscription */
subscribeURLs(url, getServices(url), listener); @Override
public void onApplicationEvent(ServiceInstancesChangedEvent event) {
// Async subscription String appName = event.getServiceName();
registerServiceInstancesChangedListener(url,
new ServiceInstanceChangeListener() { List<ServiceInstance> instances = filter(event.getServiceInstances() != null
? event.getServiceInstances() : Collections.emptyList());
@Override Set<String> subscribedServiceNames = getServices(null);
public int getOrder() {
return Ordered.LOWEST_PRECEDENCE;
}
@Override if (!subscribedServiceNames.contains(appName)) {
public void onApplicationEvent(ServiceInstancesChangedEvent event) {
Set<String> serviceNames = getServices(url);
String serviceName = event.getServiceName();
if (serviceNames.contains(serviceName)) {
logger.debug(
"handle serviceInstanceChange of general service, serviceName = {}, subscribeUrl={}",
event.getServiceName(), url.getServiceKey());
try {
subscribeURLs(url, serviceNames, listener);
reConnectJobMap.remove(serviceName);
}
catch (Exception e) {
logger.warn(String.format(
"subscribeURLs failed, serviceName = %s, try reSubscribe again",
serviceName), e);
addReSubscribeMetadataJob(serviceName, 0);
}
}
}
@Override
public String toString() {
return "ServiceInstancesChangedEventListener:"
+ url.getServiceKey();
}
});
}
void addReSubscribeMetadataJob(String serviceName, int count) {
if (count > maxReSubscribeMetadataTimes) {
logger.error(
"reSubscribe failed too many times, serviceName = {}, count = {}",
serviceName, count);
return; return;
} }
ReSubscribeMetadataJob job = new ReSubscribeMetadataJob(serviceName, this, count);
reConnectJobMap.put(serviceName, job);
reConnectPool.schedule(job, reSubscribeMetadataIntervial, TimeUnit.SECONDS);
}
void subscribeURLs(URL url, Set<String> serviceNames, NotifyListener listener) { if (instances.size() == 0) {
logger.warn("APP {} instance changed, size changed zero!!!", appName);
}
else {
logger.info("APP {} instance changed, size changed to {}", appName,
instances.size());
}
// group by revision
Map<String, List<ServiceInstance>> newGroup = instances.stream()
.collect(Collectors.groupingBy(RevisionResolver::getRevision));
List<URL> subscribedURLs = new LinkedList<>(); synchronized (this) {
serviceNames.forEach(serviceName -> { Map<String, List<ServiceInstance>> oldGroup = serviceRevisionInstanceMap
.computeIfAbsent(appName, k -> new HashMap<>());
subscribeURLs(url, subscribedURLs, serviceName, if (serviceInstanceNotChanged(oldGroup, newGroup)) {
() -> getServiceInstances(serviceName)); logger.debug("APP {} instance changed, but nothing different", appName);
return;
}
}); try {
// Notify all // ensure that the service metadata is correct
notifyAllSubscribedURLs(url, subscribedURLs, listener); refreshServiceMetadataInfo(appName, instances);
}
// then , refresh general service associated with current application
refreshGeneralServiceInfo(appName, oldGroup, newGroup);
private void registerServiceInstancesChangedListener(URL url, // mark process successful
ApplicationListener<ServiceInstancesChangedEvent> listener) { reSubscribeManager.onRefreshSuccess(event);
String listenerId = generateId(url); }
if (REGISTER_LISTENERS.add(listenerId)) { catch (Exception e) {
applicationContext.addApplicationListener(listener); logger.error(String.format(
"APP %s instance changed, handler faild, try resubscribe",
appName), e);
reSubscribeManager.onRefreshFail(event);
}
} }
} }
private void subscribeURLs(URL subscribedURL, List<URL> subscribedURLs, private void refreshGeneralServiceInfo(String appName,
String serviceName, Map<String, List<ServiceInstance>> oldGroup,
Supplier<List<ServiceInstance>> serviceInstancesSupplier) { Map<String, List<ServiceInstance>> newGroup) {
List<ServiceInstance> serviceInstances = serviceInstancesSupplier.get();
subscribeURLs(subscribedURL, subscribedURLs, serviceName, serviceInstances); Set<URL> urls2refresh = new HashSet<>();
}
private void subscribeURLs(URL subscribedURL, List<URL> subscribedURLs, // compare with local
String serviceName, List<ServiceInstance> serviceInstances) { for (String revision : oldGroup.keySet()) {
if (CollectionUtils.isEmpty(serviceInstances)) { if (!newGroup.containsKey(revision)) {
if (logger.isWarnEnabled()) { // all instances of this list with revision has losted
logger.warn(format("There is no instance in service[name : %s]", urlSubscribeHandlerMap.forEach((url, handler) -> {
serviceName)); if (handler.relatedWith(appName, revision)) {
handler.removeAppNameWithRevision(appName, revision);
urls2refresh.add(url);
}
});
logger.debug("Subscription app {} revision {} has all losted", appName,
revision);
} }
} }
else {
logger.debug("subscribe from serviceName = {}, size = {}", serviceName,
serviceInstances.size());
}
List<URL> exportedURLs = getExportedURLs(subscribedURL, serviceName, for (Map.Entry<String, List<ServiceInstance>> entry : newGroup.entrySet()) {
serviceInstances); String revision = entry.getKey();
List<ServiceInstance> instanceList = entry.getValue();
/**
* Add the exported URLs from {@link MetadataService}
*/
subscribedURLs.addAll(exportedURLs);
}
private List<URL> getExportedURLs(URL subscribedURL, String serviceName, if (!oldGroup.containsKey(revision)) {
List<ServiceInstance> serviceInstances) { // this instance list of revision not exists
// should acquire urls
urlSubscribeHandlerMap.forEach(
(url, handler) -> handler.init(appName, revision, instanceList));
}
List<ServiceInstance> validServiceInstances = filter(serviceInstances); urlSubscribeHandlerMap.forEach((url, handler) -> {
if (handler.relatedWith(appName, revision)) {
urls2refresh.add(url);
}
});
// If there is no valid ServiceInstance, return empty result if (logger.isDebugEnabled()) {
if (isEmpty(validServiceInstances)) { logger.debug("Subscription app {} revision {} changed, instance list {}",
if (logger.isWarnEnabled()) { appName, revision,
logger.warn( instanceList.stream().map(
"There is no instance from service[name : {}], and then Dubbo Service[key : {}] will not be " instance -> instance.getHost() + ":" + instance.getPort())
+ "available , please make sure the further impact", .collect(Collectors.toList()));
serviceName, subscribedURL.getServiceKey());
} }
return emptyList();
} }
List<URL> subscribedURLs = cloneExportedURLs(subscribedURL, serviceInstances); serviceRevisionInstanceMap.put(appName, newGroup);
// clear local service instances, help GC
validServiceInstances.clear();
return subscribedURLs; if (urls2refresh.size() == 0) {
logger.debug("Subscription app {}, no urls will be refreshed", appName);
}
else {
logger.debug("Subscription app {}, the following url will be refresh:{}",
appName, urls2refresh.stream().map(URL::getServiceKey)
.collect(Collectors.toList()));
for (URL url : urls2refresh) {
GenearalServiceSubscribeHandler handler = urlSubscribeHandlerMap.get(url);
if (handler == null) {
logger.warn("Subscription app {}, can't find handler for service {}",
appName, url.getServiceKey());
continue;
}
handler.refresh();
}
}
} }
/** private void refreshServiceMetadataInfo(String serviceName,
* Clone the subscribed URLs based on the template URLs.
* @param subscribedURL the URL to be subscribed
* @param serviceInstances the list of {@link ServiceInstance service instances}
* @return non-null
*/
private List<URL> cloneExportedURLs(URL subscribedURL,
List<ServiceInstance> serviceInstances) { List<ServiceInstance> serviceInstances) {
MetadataServiceSubscribeHandler handler = metadataSubscribeHandlerMap
.get(serviceName);
List<URL> clonedExportedURLs = new LinkedList<>(); if (handler == null) {
logger.warn("Subscription app {}, can't find metadata handler", serviceName);
serviceInstances.forEach(serviceInstance -> { return;
}
String host = serviceInstance.getHost(); handler.refresh(serviceInstances);
getTemplateExportedURLs(subscribedURL, serviceInstances).stream()
.map(templateURL -> templateURL.removeParameter(TIMESTAMP_KEY))
.map(templateURL -> templateURL.removeParameter(PID_KEY))
.map(templateURL -> {
String protocol = templateURL.getProtocol();
Integer port = repository.getDubboProtocolPort(serviceInstance,
protocol);
// reserve tag
String tag = null;
List<URL> urls = jsonUtils.toURLs(serviceInstance.getMetadata()
.get("dubbo.metadata-service.urls"));
if (urls != null && urls.size() > 0) {
Map<String, String> parameters = urls.get(0).getParameters();
tag = parameters.get("dubbo.tag");
}
if (Objects.equals(templateURL.getHost(), host)
&& Objects.equals(templateURL.getPort(), port)) { // use
// templateURL
// if
// equals
return templateURL;
}
if (port == null) {
if (logger.isWarnEnabled()) {
logger.warn(
"The protocol[{}] port of Dubbo service instance[host : {}] "
+ "can't be resolved",
protocol, host);
}
return null;
}
else {
URLBuilder clonedURLBuilder = from(templateURL) // remove the
// parameters from
// the template
// URL
.setHost(host) // reset the host
.setPort(port) // reset the port
.addParameter("dubbo.tag", tag); // reset the tag
return clonedURLBuilder.build();
}
}).filter(Objects::nonNull).forEach(clonedExportedURLs::add);
});
return clonedExportedURLs;
} }
private List<URL> getTemplateExportedURLs(URL subscribedURL, private boolean serviceInstanceNotChanged(Map<String, List<ServiceInstance>> oldGroup,
List<ServiceInstance> serviceInstances) { Map<String, List<ServiceInstance>> newGroup) {
if (newGroup.size() != oldGroup.size()) {
return false;
}
DubboMetadataService dubboMetadataService = getProxy(serviceInstances); for (Map.Entry<String, List<ServiceInstance>> entry : newGroup.entrySet()) {
String appName = entry.getKey();
List<ServiceInstance> newInstances = entry.getValue();
List<URL> templateExportedURLs = emptyList(); if (!oldGroup.containsKey(appName)) {
return false;
}
if (dubboMetadataService != null) { List<ServiceInstance> oldInstances = oldGroup.get(appName);
templateExportedURLs = getExportedURLs(dubboMetadataService, subscribedURL); if (newInstances.size() != oldInstances.size()) {
} return false;
else {
if (logger.isWarnEnabled()) {
logger.warn(
"The metadata of Dubbo service[key : {}] still can't be found, it could effect the further "
+ "Dubbo service invocation",
subscribedURL.getServiceKey());
} }
boolean matched = newInstances.stream().allMatch(newInstance -> {
for (ServiceInstance oldInstance : oldInstances) {
if (instanceSame(newInstance, oldInstance)) {
return true;
}
}
return false;
});
if (!matched) {
return false;
}
} }
return templateExportedURLs; return true;
} }
private DubboMetadataService getProxy(List<ServiceInstance> serviceInstances) { private boolean instanceSame(ServiceInstance newInstance,
return dubboMetadataConfigServiceProxy.getProxy(serviceInstances); ServiceInstance oldInstance) {
if (!StringUtils.equals(newInstance.getInstanceId(),
oldInstance.getInstanceId())) {
return false;
}
if (!StringUtils.equals(newInstance.getHost(), oldInstance.getHost())) {
return false;
}
if (!StringUtils.equals(newInstance.getServiceId(), oldInstance.getServiceId())) {
return false;
}
if (!StringUtils.equals(newInstance.getScheme(), oldInstance.getScheme())) {
return false;
}
if (oldInstance.getPort() != newInstance.getPort()) {
return false;
}
if (!oldInstance.getMetadata().equals(newInstance.getMetadata())) {
return false;
}
return true;
} }
private List<ServiceInstance> filter(Collection<ServiceInstance> serviceInstances) { private List<ServiceInstance> filter(Collection<ServiceInstance> serviceInstances) {
@ -438,37 +448,16 @@ public class DubboCloudRegistry extends FailbackRegistry {
return metadata.containsKey(METADATA_SERVICE_URLS_PROPERTY_NAME); return metadata.containsKey(METADATA_SERVICE_URLS_PROPERTY_NAME);
} }
Set<String> getServices(URL url) { private Set<String> getServices(URL url) {
Set<String> subscribedServices = repository.getSubscribedServices(); Set<String> subscribedServices = repository.getSubscribedServices();
if (subscribedServices.contains("*")) {
subscribedServices = new HashSet<>(discoveryClient.getServices());
}
// TODO Add the filter feature // TODO Add the filter feature
return subscribedServices; return subscribedServices;
} }
private void notifyAllSubscribedURLs(URL url, List<URL> subscribedURLs, List<ServiceInstance> getServiceInstances(String serviceName) {
NotifyListener listener) {
if (isEmpty(subscribedURLs)) {
// Add the EMPTY_PROTOCOL URL
subscribedURLs.add(emptyURL(url));
// if (isDubboMetadataServiceURL(url)) {
// if meta service change, and serviceInstances is zero, will clean up
// information about this client
// String serviceName = url.getParameter(GROUP_KEY);
// repository.removeMetadataAndInitializedService(serviceName, url);
// }
}
if (logger.isDebugEnabled()) {
logger.debug("The subscribed URL[{}] will notify all URLs : {}", url,
subscribedURLs);
}
// Notify all
listener.notify(subscribedURLs);
}
private List<ServiceInstance> getServiceInstances(String serviceName) {
return hasText(serviceName) ? doGetServiceInstances(serviceName) : emptyList(); return hasText(serviceName) ? doGetServiceInstances(serviceName) : emptyList();
} }
@ -485,108 +474,14 @@ public class DubboCloudRegistry extends FailbackRegistry {
return serviceInstances; return serviceInstances;
} }
private String generateId(URL url) { // the group of DubboMetadataService is current application name
return url.toString();
}
private URL emptyURL(URL url) {
// issue : When the last service provider is closed, the client still periodically
// connects to the last provider.n
// fix https://github.com/alibaba/spring-cloud-alibaba/issues/1259
return from(url).setProtocol(EMPTY_PROTOCOL).removeParameter(CATEGORY_KEY)
.build();
}
private List<URL> getExportedURLs(DubboMetadataService dubboMetadataService,
URL subscribedURL) {
String serviceInterface = subscribedURL.getServiceInterface();
String group = subscribedURL.getParameter(GROUP_KEY);
String version = subscribedURL.getParameter(VERSION_KEY);
// The subscribed protocol may be null
String subscribedProtocol = subscribedURL.getParameter(PROTOCOL_KEY);
String exportedURLsJSON = dubboMetadataService.getExportedURLs(serviceInterface,
group, version);
return jsonUtils.toURLs(exportedURLsJSON).stream()
.filter(exportedURL -> subscribedProtocol == null
|| subscribedProtocol.equalsIgnoreCase(exportedURL.getProtocol()))
.collect(Collectors.toList());
}
private void subscribeDubboMetadataServiceURLs(URL subscribedURL,
NotifyListener listener) {
subscribeDubboMetadataServiceURLs(subscribedURL, listener,
getServiceName(subscribedURL));
// Sync subscription
if (containsProviderCategory(subscribedURL)) {
registerServiceInstancesChangedListener(subscribedURL,
new ServiceInstanceChangeListener() {
@Override
public int getOrder() {
return Ordered.LOWEST_PRECEDENCE - 1;
}
@Override
public void onApplicationEvent(
ServiceInstancesChangedEvent event) {
String sourceServiceName = event.getServiceName();
List<ServiceInstance> serviceInstances = event
.getServiceInstances();
String serviceName = getServiceName(subscribedURL);
if (Objects.equals(sourceServiceName, serviceName)) {
logger.debug(
"handle serviceInstanceChange of metadata service, serviceName = {}, subscribeUrl={}",
event.getServiceName(),
subscribedURL.getServiceKey());
// only update serviceInstances of the specified
// serviceName
subscribeDubboMetadataServiceURLs(subscribedURL, listener,
sourceServiceName, serviceInstances);
}
}
@Override
public String toString() {
return "ServiceInstancesChangedEventListener:"
+ subscribedURL.getServiceKey();
}
});
}
}
private String getServiceName(URL subscribedURL) { private String getServiceName(URL subscribedURL) {
return subscribedURL.getParameter(GROUP_KEY); return subscribedURL.getParameter(GROUP_KEY);
} }
private void subscribeDubboMetadataServiceURLs(URL subscribedURL,
NotifyListener listener, String serviceName,
List<ServiceInstance> serviceInstances) {
String serviceInterface = subscribedURL.getServiceInterface();
String version = subscribedURL.getParameter(VERSION_KEY);
String protocol = subscribedURL.getParameter(PROTOCOL_KEY);
List<URL> urls = dubboMetadataUtils.getDubboMetadataServiceURLs(serviceInstances,
serviceInterface, version, protocol);
notifyAllSubscribedURLs(subscribedURL, urls, listener);
}
private void subscribeDubboMetadataServiceURLs(URL subscribedURL,
NotifyListener listener, String serviceName) {
List<ServiceInstance> serviceInstances = getServiceInstances(serviceName);
subscribeDubboMetadataServiceURLs(subscribedURL, listener, serviceName,
serviceInstances);
}
private boolean containsProviderCategory(URL subscribedURL) { private boolean containsProviderCategory(URL subscribedURL) {
String category = subscribedURL.getParameter(CATEGORY_KEY); String category = subscribedURL.getParameter(CATEGORY_KEY);
return category == null ? false : category.contains(PROVIDER); return category != null && category.contains(PROVIDER);
} }
@Override @Override
@ -603,16 +498,36 @@ public class DubboCloudRegistry extends FailbackRegistry {
return ADMIN_PROTOCOL.equals(url.getProtocol()); return ADMIN_PROTOCOL.equals(url.getProtocol());
} }
public Map<URL, NotifyListener> getUrlNotifyListenerMap() { protected boolean isDubboMetadataServiceURL(URL url) {
return urlNotifyListenerMap; return DUBBO_METADATA_SERVICE_CLASS_NAME.equals(url.getServiceInterface());
} }
public Map<String, ReSubscribeMetadataJob> getReConnectJobMap() { protected boolean isConsumerServiceURL(URL url) {
return reConnectJobMap; return CONSUMER.equals(url.getProtocol());
} }
protected boolean isDubboMetadataServiceURL(URL url) { public List<ServiceInstance> getServiceInstances(Map<String, Set<String>> providers) {
return DUBBO_METADATA_SERVICE_CLASS_NAME.equals(url.getServiceInterface()); List<ServiceInstance> instances = new ArrayList<>();
providers.forEach((appName, revisions) -> {
Map<String, List<ServiceInstance>> revisionMap = serviceRevisionInstanceMap
.get(appName);
if (revisionMap == null) {
return;
}
for (String revision : revisions) {
List<ServiceInstance> list = revisionMap.get(revision);
if (list != null) {
instances.addAll(list);
}
}
});
return instances;
}
public Map<String, Map<String, List<ServiceInstance>>> getServiceRevisionInstanceMap() {
return serviceRevisionInstanceMap;
} }
} }

@ -0,0 +1,280 @@
/*
* Copyright 2013-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.cloud.dubbo.registry;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import com.alibaba.cloud.dubbo.metadata.RevisionResolver;
import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
import com.alibaba.cloud.dubbo.service.DubboMetadataService;
import com.alibaba.cloud.dubbo.service.DubboMetadataServiceProxy;
import com.alibaba.cloud.dubbo.util.JSONUtils;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.URLBuilder;
import org.apache.dubbo.registry.NotifyListener;
import org.apache.dubbo.rpc.RpcContext;
import org.springframework.cloud.client.ServiceInstance;
import static com.alibaba.cloud.dubbo.metadata.RevisionResolver.SCA_REVSION_KEY;
import static java.util.Collections.emptyList;
import static org.apache.dubbo.common.URLBuilder.from;
import static org.apache.dubbo.common.constants.CommonConstants.GROUP_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PID_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PROTOCOL_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.TIMESTAMP_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY;
/**
* @author <a href="mailto:chenxilzx1@gmail.com">theonefx</a>
*/
public class GenearalServiceSubscribeHandler extends AbstractServiceSubscribeHandler {
/**
* the provider which can provide service of the url. {appName, [revisions]}
*/
private final Map<String, Set<String>> providers = new HashMap<>();
private final Map<String, URL> urlTemplateMap = new HashMap<>();
private final JSONUtils jsonUtils;
private final DubboServiceMetadataRepository repository;
private final DubboMetadataServiceProxy dubboMetadataConfigServiceProxy;
public GenearalServiceSubscribeHandler(URL url, NotifyListener listener,
DubboCloudRegistry registry, DubboServiceMetadataRepository repository,
JSONUtils jsonUtils,
DubboMetadataServiceProxy dubboMetadataConfigServiceProxy) {
super(url, listener, registry);
this.repository = repository;
this.jsonUtils = jsonUtils;
this.dubboMetadataConfigServiceProxy = dubboMetadataConfigServiceProxy;
}
public boolean relatedWith(String appName, String revision) {
Set<String> list = providers.get(appName);
if (list != null && list.size() > 0) {
if (list.contains(revision)) {
return true;
}
}
return false;
}
public void removeAppNameWithRevision(String appName, String revision) {
Set<String> list = providers.get(appName);
if (list != null) {
list.remove(revision);
if (list.size() == 0) {
providers.remove(appName);
}
}
}
public void addAppNameWithRevision(String appName, String revision) {
Set<String> set = providers.computeIfAbsent(appName, k -> new HashSet<>());
set.add(revision);
}
public synchronized void doInit() {
logger.debug("Subscription interface {}, GenearalServiceSubscribeHandler init",
url.getServiceKey());
Map<String, Map<String, List<ServiceInstance>>> map = registry
.getServiceRevisionInstanceMap();
for (Map.Entry<String, Map<String, List<ServiceInstance>>> entry : map
.entrySet()) {
String appName = entry.getKey();
Map<String, List<ServiceInstance>> revisionMap = entry.getValue();
for (Map.Entry<String, List<ServiceInstance>> revisionEntity : revisionMap
.entrySet()) {
String revision = revisionEntity.getKey();
List<ServiceInstance> instances = revisionEntity.getValue();
init(appName, revision, instances);
}
}
refresh();
}
public void init(String appName, String revision,
List<ServiceInstance> instanceList) {
List<URL> urls = getTemplateExportedURLs(url, revision, instanceList);
if (urls != null && urls.size() > 0) {
addAppNameWithRevision(appName, revision);
setUrlTemplate(appName, revision, urls);
}
}
public synchronized void refresh() {
List<URL> urls = getProviderURLs();
notifyAllSubscribedURLs(url, urls, listener);
}
private List<URL> getProviderURLs() {
List<ServiceInstance> instances = registry.getServiceInstances(providers);
logger.debug("Subscription interfece {}, providers {}, total {}",
url.getServiceKey(), providers, instances.size());
if (instances.size() == 0) {
return Collections.emptyList();
}
return cloneExportedURLs(instances);
}
void setUrlTemplate(String appName, String revision, List<URL> urls) {
if (urls == null || urls.size() == 0) {
return;
}
String key = getAppRevisionKey(appName, revision);
if (urlTemplateMap.containsKey(key)) {
return;
}
urlTemplateMap.put(key, urls.get(0));
}
private String getAppRevisionKey(String appName, String revision) {
return appName + "@" + revision;
}
/**
* Clone the subscribed URLs based on the template URLs.
* @param serviceInstances the list of
* {@link org.springframework.cloud.client.ServiceInstance service instances}
* @return
*/
List<URL> cloneExportedURLs(List<ServiceInstance> serviceInstances) {
List<URL> urlsCloneTo = new ArrayList<>();
serviceInstances.forEach(serviceInstance -> {
String host = serviceInstance.getHost();
String appName = serviceInstance.getServiceId();
String revision = RevisionResolver.getRevision(serviceInstance);
URL template = urlTemplateMap.get(getAppRevisionKey(appName, revision));
Stream.of(template)
.map(templateURL -> templateURL.removeParameter(TIMESTAMP_KEY))
.map(templateURL -> templateURL.removeParameter(PID_KEY))
.map(templateURL -> {
String protocol = templateURL.getProtocol();
Integer port = repository.getDubboProtocolPort(serviceInstance,
protocol);
// reserve tag
String tag = null;
List<URL> urls = jsonUtils.toURLs(serviceInstance.getMetadata()
.get("dubbo.metadata-service.urls"));
if (urls != null && urls.size() > 0) {
Map<String, String> parameters = urls.get(0).getParameters();
tag = parameters.get("dubbo.tag");
}
if (Objects.equals(templateURL.getHost(), host)
&& Objects.equals(templateURL.getPort(), port)) { // use
// templateURL
// if
// equals
return templateURL;
}
if (port == null) {
if (logger.isWarnEnabled()) {
logger.warn(
"The protocol[{}] port of Dubbo service instance[host : {}] "
+ "can't be resolved",
protocol, host);
}
return null;
}
else {
URLBuilder clonedURLBuilder = from(templateURL) // remove the
// parameters from
// the template
// URL
.setHost(host) // reset the host
.setPort(port) // reset the port
.addParameter("dubbo.tag", tag); // reset the tag
return clonedURLBuilder.build();
}
}).filter(Objects::nonNull).forEach(urlsCloneTo::add);
});
return urlsCloneTo;
}
private List<URL> getTemplateExportedURLs(URL subscribedURL, String revision,
List<ServiceInstance> serviceInstances) {
DubboMetadataService dubboMetadataService = getProxy(serviceInstances);
List<URL> templateExportedURLs = emptyList();
if (dubboMetadataService != null) {
templateExportedURLs = getExportedURLs(dubboMetadataService, revision,
subscribedURL);
}
else {
if (logger.isWarnEnabled()) {
logger.warn(
"The metadata of Dubbo service[key : {}] still can't be found, it could effect the further "
+ "Dubbo service invocation",
subscribedURL.getServiceKey());
}
}
return templateExportedURLs;
}
private DubboMetadataService getProxy(List<ServiceInstance> serviceInstances) {
return dubboMetadataConfigServiceProxy.getProxy(serviceInstances);
}
private List<URL> getExportedURLs(DubboMetadataService dubboMetadataService,
String revision, URL subscribedURL) {
String serviceInterface = subscribedURL.getServiceInterface();
String group = subscribedURL.getParameter(GROUP_KEY);
String version = subscribedURL.getParameter(VERSION_KEY);
RpcContext.getContext().setAttachment(SCA_REVSION_KEY, revision);
String exportedURLsJSON = dubboMetadataService.getExportedURLs(serviceInterface,
group, version);
// The subscribed protocol may be null
String subscribedProtocol = subscribedURL.getParameter(PROTOCOL_KEY);
return jsonUtils.toURLs(exportedURLsJSON).stream()
.filter(exportedURL -> subscribedProtocol == null
|| subscribedProtocol.equalsIgnoreCase(exportedURL.getProtocol()))
.collect(Collectors.toList());
}
}

@ -0,0 +1,76 @@
/*
* Copyright 2013-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.cloud.dubbo.registry;
import java.util.List;
import com.alibaba.cloud.dubbo.util.DubboMetadataUtils;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.registry.NotifyListener;
import org.springframework.cloud.client.ServiceInstance;
import static org.apache.dubbo.common.constants.CommonConstants.PROTOCOL_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY;
/**
* @author <a href="mailto:chenxilzx1@gmail.com">theonefx</a>
*/
public class MetadataServiceSubscribeHandler extends AbstractServiceSubscribeHandler {
private final String appName;
private final DubboMetadataUtils dubboMetadataUtils;
public MetadataServiceSubscribeHandler(String appName, URL url,
NotifyListener listener, DubboCloudRegistry registry,
DubboMetadataUtils dubboMetadataUtils) {
super(url, listener, registry);
this.appName = appName;
this.dubboMetadataUtils = dubboMetadataUtils;
}
@Override
public void doInit() {
logger.debug("Subscription app {} MetadataService handler init", appName);
List<ServiceInstance> serviceInstances = registry.getServiceInstances(appName);
subscribeDubboMetadataServiceURLs(url, listener, serviceInstances);
}
public void refresh(List<ServiceInstance> serviceInstances) {
logger.debug("Subscription app {}, instance changed, new size = {}", appName,
serviceInstances.size());
subscribeDubboMetadataServiceURLs(url, listener, serviceInstances);
}
private void subscribeDubboMetadataServiceURLs(URL subscribedURL,
NotifyListener listener, List<ServiceInstance> serviceInstances) {
logger.debug("Subscription app {}, service instance changed to size {}", appName,
serviceInstances.size());
String serviceInterface = subscribedURL.getServiceInterface();
String version = subscribedURL.getParameter(VERSION_KEY);
String protocol = subscribedURL.getParameter(PROTOCOL_KEY);
List<URL> urls = dubboMetadataUtils.getDubboMetadataServiceURLs(serviceInstances,
serviceInterface, version, protocol);
notifyAllSubscribedURLs(subscribedURL, urls, listener);
}
}

@ -0,0 +1,125 @@
/*
* Copyright 2013-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.cloud.dubbo.registry;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import com.alibaba.cloud.dubbo.env.DubboCloudProperties;
import com.alibaba.cloud.dubbo.registry.event.ServiceInstancesChangedEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.client.ServiceInstance;
/**
* @author <a href="mailto:chenxilzx1@gmail.com">theonefx</a>
*/
public class ReSubscribeManager {
private final Logger logger = LoggerFactory.getLogger(ReSubscribeManager.class);
private final Map<String, ReSubscribeMetadataJob> reConnectJobMap = new ConcurrentHashMap<>();
private final ScheduledThreadPoolExecutor reConnectPool = new ScheduledThreadPoolExecutor(
5);
private final DubboCloudRegistry registry;
private final DubboCloudProperties properties;
public ReSubscribeManager(DubboCloudRegistry registry) {
this.registry = registry;
this.properties = registry.getBean(DubboCloudProperties.class);
reConnectPool.setKeepAliveTime(10, TimeUnit.MINUTES);
reConnectPool.allowCoreThreadTimeOut(true);
}
public void onRefreshSuccess(ServiceInstancesChangedEvent event) {
reConnectJobMap.remove(event.getServiceName());
}
public void onRefreshFail(ServiceInstancesChangedEvent event) {
String serviceName = event.getServiceName();
int count = 1;
if (event instanceof FakeServiceInstancesChangedEvent) {
count = ((FakeServiceInstancesChangedEvent) event).getCount() + 1;
}
if (count >= properties.getMaxReSubscribeMetadataTimes()) {
logger.error(
"reSubscribe failed too many times, serviceName = {}, count = {}",
serviceName, count);
return;
}
ReSubscribeMetadataJob job = new ReSubscribeMetadataJob(serviceName, count);
reConnectPool.schedule(job, properties.getReSubscribeMetadataIntervial(),
TimeUnit.SECONDS);
}
private final class ReSubscribeMetadataJob implements Runnable {
private final String serviceName;
private final int errorCounts;
private ReSubscribeMetadataJob(String serviceName, int errorCounts) {
this.errorCounts = errorCounts;
this.serviceName = serviceName;
}
@Override
public void run() {
if (!reConnectJobMap.containsKey(serviceName)
|| reConnectJobMap.get(serviceName) != this) {
return;
}
List<ServiceInstance> list = registry.getServiceInstances(serviceName);
FakeServiceInstancesChangedEvent event = new FakeServiceInstancesChangedEvent(
serviceName, list, errorCounts);
registry.onApplicationEvent(event);
}
}
private static final class FakeServiceInstancesChangedEvent
extends ServiceInstancesChangedEvent {
private static final long serialVersionUID = -2832478604601472915L;
private final int count;
private FakeServiceInstancesChangedEvent(String serviceName,
List<ServiceInstance> serviceInstances, int count) {
super(serviceName, serviceInstances);
this.count = count;
}
public int getCount() {
return count;
}
}
}

@ -1,84 +0,0 @@
/*
* Copyright 2013-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.cloud.dubbo.registry;
import java.util.Map;
import java.util.Set;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.registry.NotifyListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* For re subscribe URL from provider.
*
* @author <a href="mailto:chenxilzx1@gmail.com">theonefx</a>
*/
public class ReSubscribeMetadataJob implements Runnable {
protected final Logger logger = LoggerFactory.getLogger(ReSubscribeMetadataJob.class);
private final String serviceName;
private final DubboCloudRegistry dubboCloudRegistry;
private final int errorCounts;
public ReSubscribeMetadataJob(String serviceName,
DubboCloudRegistry dubboCloudRegistry, int errorCounts) {
this.errorCounts = errorCounts;
this.serviceName = serviceName;
this.dubboCloudRegistry = dubboCloudRegistry;
}
public ReSubscribeMetadataJob(String serviceName,
DubboCloudRegistry dubboCloudRegistry) {
this(serviceName, dubboCloudRegistry, 0);
}
@Override
public void run() {
if (dubboCloudRegistry.getReConnectJobMap().get(serviceName) != this) {
return;
}
try {
logger.info("reSubscribe, serviceName = {}, count = {}", serviceName,
errorCounts);
for (Map.Entry<URL, NotifyListener> entry : dubboCloudRegistry
.getUrlNotifyListenerMap().entrySet()) {
doRun(entry.getKey(), entry.getValue());
}
dubboCloudRegistry.getReConnectJobMap().remove(serviceName);
}
catch (Exception e) {
logger.warn(String.format(
"reSubscribe failed, serviceName = %s, try refresh again",
serviceName), e);
dubboCloudRegistry.addReSubscribeMetadataJob(serviceName, errorCounts + 1);
}
}
private void doRun(URL url, NotifyListener listener) {
Set<String> serviceNames = dubboCloudRegistry.getServices(url);
if (serviceNames.contains(serviceName)) {
dubboCloudRegistry.subscribeURLs(url, serviceNames, listener);
}
}
}

@ -89,7 +89,7 @@ public class SpringCloudRegistryFactory extends AbstractRegistryFactory {
DubboCloudProperties dubboCloudProperties = applicationContext DubboCloudProperties dubboCloudProperties = applicationContext
.getBean(DubboCloudProperties.class); .getBean(DubboCloudProperties.class);
Registry registry = null; Registry registry;
switch (dubboCloudProperties.getRegistryType()) { switch (dubboCloudProperties.getRegistryType()) {
case SPRING_CLOUD_REGISTRY_PROPERTY_VALUE: case SPRING_CLOUD_REGISTRY_PROPERTY_VALUE:
@ -100,9 +100,7 @@ public class SpringCloudRegistryFactory extends AbstractRegistryFactory {
default: default:
registry = new DubboCloudRegistry(url, discoveryClient, registry = new DubboCloudRegistry(url, discoveryClient,
dubboServiceMetadataRepository, dubboMetadataConfigServiceProxy, dubboServiceMetadataRepository, dubboMetadataConfigServiceProxy,
jsonUtils, dubboGenericServiceFactory, applicationContext, jsonUtils, applicationContext);
dubboCloudProperties.getMaxReSubscribeMetadataTimes(),
dubboCloudProperties.getReSubscribeMetadataIntervial());
break; break;
} }

@ -78,6 +78,9 @@ public class DubboGenericServiceFactory {
String interfaceName = serviceClass.getName(); String interfaceName = serviceClass.getName();
ReferenceBean<GenericService> referenceBean = build(interfaceName, version, ReferenceBean<GenericService> referenceBean = build(interfaceName, version,
serviceName, emptyMap()); serviceName, emptyMap());
if (DubboMetadataService.class == serviceClass) {
referenceBean.setRouter("-default,revisionRouter");
}
return referenceBean.get(); return referenceBean.get();
} }

@ -125,6 +125,7 @@ public class DubboMetadataServiceProxy implements BeanClassLoaderAware, Disposab
private DubboMetadataService createProxyIfAbsent(URL dubboMetadataServiceURL) { private DubboMetadataService createProxyIfAbsent(URL dubboMetadataServiceURL) {
String serviceName = dubboMetadataServiceURL.getParameter(APPLICATION_KEY); String serviceName = dubboMetadataServiceURL.getParameter(APPLICATION_KEY);
String version = dubboMetadataServiceURL.getParameter(VERSION_KEY); String version = dubboMetadataServiceURL.getParameter(VERSION_KEY);
// Initialize DubboMetadataService with right version // Initialize DubboMetadataService with right version
return createProxyIfAbsent(serviceName, version); return createProxyIfAbsent(serviceName, version);
} }

@ -0,0 +1,75 @@
/*
* Copyright 2013-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.cloud.dubbo.service;
import java.util.ArrayList;
import java.util.List;
import com.alibaba.cloud.commons.lang.StringUtils;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.rpc.Invocation;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.rpc.cluster.Router;
import org.apache.dubbo.rpc.cluster.RouterFactory;
import org.apache.dubbo.rpc.cluster.router.AbstractRouter;
import org.springframework.util.CollectionUtils;
import static com.alibaba.cloud.dubbo.metadata.RevisionResolver.SCA_REVSION_KEY;
/**
* @author <a href="mailto:chenxilzx1@gmail.com">theonefx</a>
*/
public class MetadataServiceRevisionRouterFactory implements RouterFactory {
@Override
public Router getRouter(URL url) {
return new AbstractRouter() {
@Override
public <T> List<Invoker<T>> route(List<Invoker<T>> invokers, URL url,
Invocation invocation) throws RpcException {
if (CollectionUtils.isEmpty(invokers)) {
return invokers;
}
if (!DubboMetadataService.class.getName()
.equalsIgnoreCase(url.getServiceInterface())) {
return invokers;
}
String revision = invocation.getAttachment(SCA_REVSION_KEY);
if (StringUtils.isEmpty(revision)) {
return invokers;
}
List<Invoker<T>> list = new ArrayList<>(invokers.size());
for (Invoker<T> invoker : invokers) {
if (StringUtils.equals(revision,
invoker.getUrl().getParameter(SCA_REVSION_KEY))) {
list.add(invoker);
}
}
return list;
}
};
}
}

@ -21,12 +21,14 @@ import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.alibaba.cloud.dubbo.metadata.RevisionResolver;
import com.alibaba.cloud.dubbo.service.DubboMetadataService; import com.alibaba.cloud.dubbo.service.DubboMetadataService;
import org.apache.dubbo.common.URL; import org.apache.dubbo.common.URL;
import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.ServiceInstance;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import static com.alibaba.cloud.dubbo.metadata.RevisionResolver.SCA_REVSION_KEY;
import static java.lang.String.format; import static java.lang.String.format;
import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY; import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY;
import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataUtils.METADATA_SERVICE_URLS_PROPERTY_NAME; import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataUtils.METADATA_SERVICE_URLS_PROPERTY_NAME;
@ -74,7 +76,11 @@ public class DubboMetadataUtils {
public List<URL> getDubboMetadataServiceURLs(ServiceInstance serviceInstance) { public List<URL> getDubboMetadataServiceURLs(ServiceInstance serviceInstance) {
Map<String, String> metadata = serviceInstance.getMetadata(); Map<String, String> metadata = serviceInstance.getMetadata();
String dubboURLsJSON = metadata.get(METADATA_SERVICE_URLS_PROPERTY_NAME); String dubboURLsJSON = metadata.get(METADATA_SERVICE_URLS_PROPERTY_NAME);
return jsonUtils.toURLs(dubboURLsJSON); List<URL> urls = jsonUtils.toURLs(dubboURLsJSON);
String revision = RevisionResolver.getRevision(serviceInstance);
urls = urls.stream().map(url -> url.addParameter(SCA_REVSION_KEY, revision))
.collect(Collectors.toList());
return urls;
} }
/** /**

Loading…
Cancel
Save