fix:fix tsf ipv6.

Author: SkyeBeFreeman

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

@@ -19,7 +19,10 @@
 
 import com.tencent.polaris.api.utils.MapUtils;
 import com.tencent.polaris.api.utils.StringUtils;
+import com.tencent.polaris.logging.LoggerFactory;
 import com.tencent.polaris.metadata.core.constant.MetadataConstants;
+import com.tencent.polaris.metadata.core.constant.TsfMetadataConstants;
+import org.slf4j.Logger;
 
 import java.util.Collection;
 import java.util.Map;
@@ -31,6 +34,8 @@
  */
 public class InstanceWrap implements Instance {
 
+    private static final Logger LOG = LoggerFactory.getLogger(InstanceWrap.class);
+
     private final Instance originalInstance;
 
     private final String host;
@@ -40,11 +45,26 @@ public InstanceWrap(Instance originalInstance, boolean isPreferIpv6) {
         String host = "";
         if (isPreferIpv6 && MapUtils.isNotEmpty(originalInstance.getMetadata())) {
             host = originalInstance.getMetadata().get(MetadataConstants.ADDRESS_IPV6);
+            if (StringUtils.isBlank(host)) {
+                host = originalInstance.getMetadata().get(TsfMetadataConstants.TSF_ADDRESS_IPV6);
+            }
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("get ipv6 address {} from metadata: {}", host, originalInstance.getMetadata());
+            }
         } else if (MapUtils.isNotEmpty(originalInstance.getMetadata())) {
             host = originalInstance.getMetadata().get(MetadataConstants.ADDRESS_IPV4);
+            if (StringUtils.isBlank(host)) {
+                host = originalInstance.getMetadata().get(TsfMetadataConstants.TSF_ADDRESS_IPV4);
+            }
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("get ipv4 address {} from metadata: {}", host, originalInstance.getMetadata());
+            }
         }
         if (StringUtils.isBlank(host)) {
             host = originalInstance.getHost();
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("get address {} from host", host);
+            }
         }
         this.host = host;
     }

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

@@ -21,7 +21,10 @@
 import com.tencent.polaris.api.utils.IPAddressUtils;
 import com.tencent.polaris.api.utils.MapUtils;
 import com.tencent.polaris.api.utils.StringUtils;
+import com.tencent.polaris.logging.LoggerFactory;
 import com.tencent.polaris.metadata.core.constant.MetadataConstants;
+import com.tencent.polaris.metadata.core.constant.TsfMetadataConstants;
+import org.slf4j.Logger;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,6 +37,8 @@
  */
 public class DiscoveryUtils {
 
+    private static final Logger LOG = LoggerFactory.getLogger(DiscoveryUtils.class);
+
     public static ServiceInstances generateIpv6ServiceInstances(ServiceInstances serviceInstances) {
         ServiceKey serviceKey = serviceInstances.getServiceKey();
         Map<String, String> serviceMetadata = serviceInstances.getMetadata();
@@ -49,11 +54,20 @@ public static ServiceInstances generateIpv6ServiceInstances(ServiceInstances ser
     }
 
     static boolean checkIpv6Instance(Instance instance) {
-        if (MapUtils.isNotEmpty(instance.getMetadata())
-                && instance.getMetadata().containsKey(MetadataConstants.ADDRESS_IPV6)
-                && StringUtils.isNotBlank(instance.getMetadata().get(MetadataConstants.ADDRESS_IPV6))) {
-            return true;
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("check instance if ipv6: {}:{} with metadata {}", instance.getHost(), instance.getPort(), instance.getMetadata());
+        } else if (LOG.isTraceEnabled()) {
+            LOG.trace("check instance if ipv6: {}", instance.toString());
+        }
+        
+        Map<String, String> metadata = instance.getMetadata();
+        if (MapUtils.isEmpty(metadata)) {
+            return IPAddressUtils.checkIpv6Host(instance.getHost());
         }
-        return IPAddressUtils.checkIpv6Host(instance.getHost());
+
+        String ipv6Address = metadata.get(MetadataConstants.ADDRESS_IPV6);
+        String tsfIpv6Address = metadata.get(TsfMetadataConstants.TSF_ADDRESS_IPV6);
+        return StringUtils.isNotBlank(ipv6Address) || StringUtils.isNotBlank(tsfIpv6Address)
+                || IPAddressUtils.checkIpv6Host(instance.getHost());
     }
 }