refactor:update registry status. (#1487)

Tencent · Dec 12, 2024 · d7706de · d7706de
1 parent 052f6cd
commit d7706de
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -38,3 +38,4 @@
 - [feat:upgrade trace plugin.](https://github.com/Tencent/spring-cloud-tencent/pull/1469)
 - [feat:support smooth upgrade from tsf.](https://github.com/Tencent/spring-cloud-tencent/pull/1473)
 - [fix:fix caller disposable metadata handle when using tracing.](https://github.com/Tencent/spring-cloud-tencent/pull/1477)
+- [refactor:update registry status.](https://github.com/Tencent/spring-cloud-tencent/pull/1487)
diff --git a/...is-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java b/...is-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java
@@ -235,15 +235,15 @@ public Object getStatus(PolarisRegistration registration) {
 		InstancesResponse instancesResponse = polarisDiscoveryHandler.getInstances(serviceName);
 		Instance[] instances = instancesResponse.getInstances();
 		if (null == instances) {
-			return null;
+			return "DOWN";
 		}
 		for (Instance instance : instances) {
 			if (instance.getHost().equalsIgnoreCase(registration.getHost())
 					&& instance.getPort() == registration.getPort()) {
 				return instance.isHealthy() ? "UP" : "DOWN";
 			}
 		}
-		return null;
+		return "DOWN";
 	}
 
 	/**

diff --git a/...encent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataContextHolder.java b/...encent-commons/src/main/java/com/tencent/cloud/common/metadata/MetadataContextHolder.java
@@ -158,26 +158,25 @@ public static void init(Map<String, String> dynamicTransitiveMetadata, Map<Strin
 			Map<String, String> dynamicApplicationMetadata, MetadataProvider callerMetadataProvider) {
 		com.tencent.polaris.metadata.core.manager.MetadataContextHolder.refresh(metadataManager -> {
 			// caller transitive metadata to local custom transitive metadata
-			MetadataContainer metadataContainerUpstream = metadataManager.getMetadataContainer(MetadataType.CUSTOM, false);
+			MetadataContainer calleeCustomMetadataContainer = metadataManager.getMetadataContainer(MetadataType.CUSTOM, false);
 			if (!CollectionUtils.isEmpty(dynamicTransitiveMetadata)) {
 				for (Map.Entry<String, String> entry : dynamicTransitiveMetadata.entrySet()) {
-					metadataContainerUpstream.putMetadataStringValue(entry.getKey(), entry.getValue(), TransitiveType.PASS_THROUGH);
+					calleeCustomMetadataContainer.putMetadataStringValue(entry.getKey(), entry.getValue(), TransitiveType.PASS_THROUGH);
 				}
 			}
 			// caller disposable metadata to caller custom disposable metadata
-			MetadataContainer metadataContainerDownstream = metadataManager.getMetadataContainer(MetadataType.CUSTOM, false);
 			MetadataContainer callerCustomMetadataContainer = metadataManager.getMetadataContainer(MetadataType.CUSTOM, true);
 			if (!CollectionUtils.isEmpty(dynamicDisposableMetadata)) {
 				for (Map.Entry<String, String> entry : dynamicDisposableMetadata.entrySet()) {
-					metadataContainerDownstream.putMetadataStringValue(entry.getKey(), entry.getValue(), TransitiveType.NONE);
+					calleeCustomMetadataContainer.putMetadataStringValue(entry.getKey(), entry.getValue(), TransitiveType.NONE);
 					callerCustomMetadataContainer.putMetadataStringValue(entry.getKey(), entry.getValue(), TransitiveType.DISPOSABLE);
 				}
 			}
 			// caller application metadata to caller application disposable metadata
-			MetadataContainer applicationMetadataContainerDownstream = metadataManager.getMetadataContainer(MetadataType.APPLICATION, true);
+			MetadataContainer callerApplicationMetadataContainer = metadataManager.getMetadataContainer(MetadataType.APPLICATION, true);
 			if (!CollectionUtils.isEmpty(dynamicApplicationMetadata)) {
 				for (Map.Entry<String, String> entry : dynamicApplicationMetadata.entrySet()) {
-					applicationMetadataContainerDownstream.putMetadataStringValue(entry.getKey(), entry.getValue(), TransitiveType.DISPOSABLE);
+					callerApplicationMetadataContainer.putMetadataStringValue(entry.getKey(), entry.getValue(), TransitiveType.DISPOSABLE);
 				}
 			}
 

diff --git a/.../com/tencent/cloud/polaris/context/config/extend/tsf/TsfCoreEnvironmentPostProcessor.java b/.../com/tencent/cloud/polaris/context/config/extend/tsf/TsfCoreEnvironmentPostProcessor.java
@@ -129,6 +129,10 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
 				defaultProperties.put("spring.cloud.polaris.discovery.zero-protection.enabled", "true");
 				defaultProperties.put("spring.cloud.polaris.discovery.zero-protection.is-need-test-connectivity", "true");
 				defaultProperties.put("spring.cloud.discovery.client.health-indicator.enabled", "false");
+				String warmupEnabled = environment.getProperty("spring.cloud.polaris.warmup.enabled");
+				if (StringUtils.isBlank(warmupEnabled)) {
+					defaultProperties.put("spring.cloud.polaris.warmup.enabled", true);
+				}
 
 				// contract
 				defaultProperties.put("spring.cloud.polaris.contract.enabled", environment.getProperty("tsf.swagger.enabled", "true"));