Skip to content

Commit 3aeefd5

Browse files
committed
fix:fix tsf ipv6.
1 parent 885a81c commit 3aeefd5

File tree

2 files changed

+12
-2
lines changed
  • polaris-common/polaris-model/src/main/java/com/tencent/polaris/api/pojo
  • polaris-discovery/polaris-discovery-client/src/main/java/com/tencent/polaris/discovery/client/util

2 files changed

+12
-2
lines changed

polaris-common/polaris-model/src/main/java/com/tencent/polaris/api/pojo/InstanceWrap.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.tencent.polaris.api.utils.MapUtils;
2121
import com.tencent.polaris.api.utils.StringUtils;
2222
import com.tencent.polaris.metadata.core.constant.MetadataConstants;
23+
import com.tencent.polaris.metadata.core.constant.TsfMetadataConstants;
2324

2425
import java.util.Collection;
2526
import java.util.Map;
@@ -40,8 +41,14 @@ public InstanceWrap(Instance originalInstance, boolean isPreferIpv6) {
4041
String host = "";
4142
if (isPreferIpv6 && MapUtils.isNotEmpty(originalInstance.getMetadata())) {
4243
host = originalInstance.getMetadata().get(MetadataConstants.ADDRESS_IPV6);
44+
if (StringUtils.isEmpty(host)) {
45+
host = originalInstance.getMetadata().get(TsfMetadataConstants.TSF_ADDRESS_IPV6);
46+
}
4347
} else if (MapUtils.isNotEmpty(originalInstance.getMetadata())) {
4448
host = originalInstance.getMetadata().get(MetadataConstants.ADDRESS_IPV4);
49+
if (StringUtils.isEmpty(host)) {
50+
host = originalInstance.getMetadata().get(TsfMetadataConstants.TSF_ADDRESS_IPV4);
51+
}
4552
}
4653
if (StringUtils.isBlank(host)) {
4754
host = originalInstance.getHost();

polaris-discovery/polaris-discovery-client/src/main/java/com/tencent/polaris/discovery/client/util/DiscoveryUtils.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.tencent.polaris.api.utils.MapUtils;
2323
import com.tencent.polaris.api.utils.StringUtils;
2424
import com.tencent.polaris.metadata.core.constant.MetadataConstants;
25+
import com.tencent.polaris.metadata.core.constant.TsfMetadataConstants;
2526

2627
import java.util.ArrayList;
2728
import java.util.List;
@@ -50,8 +51,10 @@ public static ServiceInstances generateIpv6ServiceInstances(ServiceInstances ser
5051

5152
static boolean checkIpv6Instance(Instance instance) {
5253
if (MapUtils.isNotEmpty(instance.getMetadata())
53-
&& instance.getMetadata().containsKey(MetadataConstants.ADDRESS_IPV6)
54-
&& StringUtils.isNotBlank(instance.getMetadata().get(MetadataConstants.ADDRESS_IPV6))) {
54+
&& ((instance.getMetadata().containsKey(MetadataConstants.ADDRESS_IPV6)
55+
&& StringUtils.isNotBlank(instance.getMetadata().get(MetadataConstants.ADDRESS_IPV6)))
56+
|| (instance.getMetadata().containsKey(TsfMetadataConstants.TSF_ADDRESS_IPV6)
57+
&& StringUtils.isNotBlank(instance.getMetadata().get(TsfMetadataConstants.TSF_ADDRESS_IPV6))))) {
5558
return true;
5659
}
5760
return IPAddressUtils.checkIpv6Host(instance.getHost());

0 commit comments

Comments
 (0)