Merge pull request #1488 from zkzlx/nacos-register

[enhance issue #1478 ]支持注册非活动节点
alibaba · Jul 24, 2020 · f9f3bd8 · f9f3bd8
2 parents f6fb689 + 940420b
commit f9f3bd8
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 1 deletion.
diff --git a/...ibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/resources/bootstrap.yaml b/...ibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/resources/bootstrap.yaml
@@ -33,6 +33,7 @@ spring:
         enabled: true
         register-enabled: true
         server-addr: 127.0.0.1:8848
+        ephemeral: false
 
 
 ---

diff --git a/...ibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java b/...ibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java
@@ -204,6 +204,11 @@ public class NacosDiscoveryProperties {
 	 */
 	private boolean instanceEnabled = true;
 
+	/**
+	 * If instance is ephemeral.The default value is true.
+	 */
+	private boolean ephemeral = true;
+
 	@Autowired
 	private InetUtils inetUtils;
 
@@ -461,6 +466,14 @@ public void setInstanceEnabled(boolean instanceEnabled) {
 		this.instanceEnabled = instanceEnabled;
 	}
 
+	public boolean isEphemeral() {
+		return ephemeral;
+	}
+
+	public void setEphemeral(boolean ephemeral) {
+		this.ephemeral = ephemeral;
+	}
+
 	@Override
 	public String toString() {
 		return "NacosDiscoveryProperties{" + "serverAddr='" + serverAddr + '\''

diff --git a/...acos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java b/...acos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java
@@ -95,6 +95,7 @@ public static ServiceInstance hostToServiceInstance(Instance instance,
 		if (instance.getMetadata() != null) {
 			metadata.putAll(instance.getMetadata());
 		}
+		metadata.put("nacos.ephemeral",String.valueOf(instance.isEphemeral()));
 		nacosServiceInstance.setMetadata(metadata);
 
 		if (metadata.containsKey("secure")) {

diff --git a/...-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java b/...-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java
@@ -161,7 +161,7 @@ private Instance getNacosInstanceFromRegistration(Registration registration) {
 		instance.setClusterName(nacosDiscoveryProperties.getClusterName());
 		instance.setEnabled(nacosDiscoveryProperties.isInstanceEnabled());
 		instance.setMetadata(registration.getMetadata());
-
+		instance.setEphemeral(nacosDiscoveryProperties.isEphemeral());
 		return instance;
 	}
 

diff --git a/...nacos-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/...nacos-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -29,6 +29,12 @@
       "defaultValue": true,
       "description": "If instance is enabled to accept request. The default value is true."
     },
+    {
+      "name": "spring.cloud.nacos.discovery.ephemeral",
+      "type": "java.lang.Boolean",
+      "defaultValue": true,
+      "description": "If instance is ephemeral.The default value is true."
+    },
     {
       "name": "spring.cloud.nacos.discovery.namingLoadCacheAtStart",
       "type": "java.lang.Boolean",