Merge branch '2022' into 22/support-nearby-polaris

pull/1627/head
Haotian Zhang 2 months ago committed by GitHub
commit 693e8d7fa1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -9,4 +9,5 @@
- [feat:support config all recover enabled.](https://github.com/Tencent/spring-cloud-tencent/pull/1604) - [feat:support config all recover enabled.](https://github.com/Tencent/spring-cloud-tencent/pull/1604)
- [feat:support stat reporting path aggregation.](https://github.com/Tencent/spring-cloud-tencent/pull/1608) - [feat:support stat reporting path aggregation.](https://github.com/Tencent/spring-cloud-tencent/pull/1608)
- [feat:support instance detect.](https://github.com/Tencent/spring-cloud-tencent/pull/1617) - [feat:support instance detect.](https://github.com/Tencent/spring-cloud-tencent/pull/1617)
- [fix: fix loadbalancer metadata type.](https://github.com/Tencent/spring-cloud-tencent/pull/1625)
- [feat:support polaris server nearby backup LB.](https://github.com/Tencent/spring-cloud-tencent/pull/1627) - [feat:support polaris server nearby backup LB.](https://github.com/Tencent/spring-cloud-tencent/pull/1627)

@ -229,7 +229,7 @@ public class MetadataContext extends com.tencent.polaris.metadata.core.manager.M
} }
public Map<String, Object> getLoadbalancerMetadata() { public Map<String, Object> getLoadbalancerMetadata() {
MetadataContainer metadataContainer = getMetadataContainer(MetadataType.APPLICATION, false); MetadataContainer metadataContainer = getMetadataContainer(MetadataType.CUSTOM, false);
MetadataValue metadataValue = metadataContainer.getMetadataValue(FRAGMENT_LB_METADATA); MetadataValue metadataValue = metadataContainer.getMetadataValue(FRAGMENT_LB_METADATA);
Map<String, Object> values = new HashMap<>(); Map<String, Object> values = new HashMap<>();
if (metadataValue instanceof MetadataMapValue) { if (metadataValue instanceof MetadataMapValue) {
@ -248,7 +248,7 @@ public class MetadataContext extends com.tencent.polaris.metadata.core.manager.M
} }
public void setLoadbalancer(String key, Object value) { public void setLoadbalancer(String key, Object value) {
MetadataContainer metadataContainer = getMetadataContainer(MetadataType.APPLICATION, false); MetadataContainer metadataContainer = getMetadataContainer(MetadataType.CUSTOM, false);
metadataContainer.putMetadataMapObjectValue(FRAGMENT_LB_METADATA, key, value); metadataContainer.putMetadataMapObjectValue(FRAGMENT_LB_METADATA, key, value);
} }

Loading…
Cancel
Save