IGNITE-26893 Java thin: improve DNS resolution logic.

modules/client/src/main/java/org/apache/ignite/client/IgniteClient.java

@@ -18,6 +18,7 @@
 package org.apache.ignite.client;
 
 import static org.apache.ignite.client.IgniteClientConfiguration.DFLT_BACKGROUND_RECONNECT_INTERVAL;
+import static org.apache.ignite.client.IgniteClientConfiguration.DFLT_BACKGROUND_RE_RESOLVE_ADDRESSES_INTERVAL;
 import static org.apache.ignite.client.IgniteClientConfiguration.DFLT_CONNECT_TIMEOUT;
 import static org.apache.ignite.client.IgniteClientConfiguration.DFLT_HEARTBEAT_INTERVAL;
 import static org.apache.ignite.client.IgniteClientConfiguration.DFLT_HEARTBEAT_TIMEOUT;
@@ -115,6 +116,8 @@ class Builder {
 
         private @Nullable String name;
 
+        long backgroundReResolveAddressesInterval = DFLT_BACKGROUND_RE_RESOLVE_ADDRESSES_INTERVAL;
+
         /**
          * Sets the addresses of Ignite server nodes within a cluster. An address can be an IP address or a hostname, with or without port.
          * If port is not set then Ignite will use the default one - see {@link IgniteClientConfiguration#DFLT_PORT}.
@@ -406,6 +409,28 @@ public Builder name(@Nullable String name) {
             return this;
         }
 
+        /**
+         * Sets how long the resolved addresses will be considered valid, in milliseconds. Set to {@code 0} for infinite validity.
+         *
+         * <p>Ignite client resolve the provided hostnames into multiple IP addresses, each corresponds to an active cluster node.
+         * However, additional IP addresses can be collected after updating the DNS records. This property controls how often Ignite
+         * client will try to re-resolve provided hostnames and connect to newly discovered addresses.
+         *
+         * @param backgroundReResolveAddressesInterval  Background re-resolve interval, in milliseconds.
+         * @return This instance.
+         * @throws IllegalArgumentException When value is less than zero.
+         */
+        public Builder backgroundReResolveAddressesInterval(long backgroundReResolveAddressesInterval) {
+            if (backgroundReResolveAddressesInterval < 0) {
+                throw new IllegalArgumentException("backgroundReResolveAddressesInterval ["
+                        + backgroundReResolveAddressesInterval + "] must be a non-negative integer value.");
+            }
+
+            this.backgroundReResolveAddressesInterval = backgroundReResolveAddressesInterval;
+
+            return this;
+        }
+
         /**
          * Builds the client.
          *
@@ -436,7 +461,8 @@ public CompletableFuture<IgniteClient> buildAsync() {
                     authenticator,
                     operationTimeout,
                     sqlPartitionAwarenessMetadataCacheSize,
-                    name
+                    name,
+                    backgroundReResolveAddressesInterval
             );
 
             return TcpIgniteClient.startAsync(cfg);

modules/client/src/main/java/org/apache/ignite/client/IgniteClientConfiguration.java

@@ -43,6 +43,9 @@ public interface IgniteClientConfiguration {
     /** Default background reconnect interval, in milliseconds. */
     long DFLT_BACKGROUND_RECONNECT_INTERVAL = 30_000L;
 
+    /** Default interval sets how long the resolved addresses will be considered valid, in milliseconds. */
+    long DFLT_BACKGROUND_RE_RESOLVE_ADDRESSES_INTERVAL = 30_000L;
+
     /** Default operation timeout, in milliseconds. */
     int DFLT_OPERATION_TIMEOUT = 0;
 
@@ -222,4 +225,16 @@ public interface IgniteClientConfiguration {
      * @return Client name.
      */
     @Nullable String name();
+
+    /**
+     * Gets how long the resolved addresses will be considered valid, in milliseconds. Set to {@code 0} for infinite validity.
+     * Default is {@link #DFLT_BACKGROUND_RE_RESOLVE_ADDRESSES_INTERVAL}.
+     *
+     * <p>Ignite client resolve the provided hostnames into multiple IP addresses, each corresponds to an active cluster node.
+     * However, additional IP addresses can be collected after updating the DNS records. This property controls how often Ignite
+     * client will try to re-resolve provided hostnames and connect to newly discovered addresses.
+     *
+     * @return Background re-resolve interval, in milliseconds.
+     */
+    long backgroundReResolveAddressesInterval();
 }

modules/client/src/main/java/org/apache/ignite/internal/client/IgniteClientConfigurationImpl.java

@@ -25,6 +25,7 @@
 import org.apache.ignite.client.SslConfiguration;
 import org.apache.ignite.lang.LoggerFactory;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.VisibleForTesting;
 
 /**
  * Immutable client configuration.
@@ -68,6 +69,10 @@ public final class IgniteClientConfigurationImpl implements IgniteClientConfigur
 
     private final @Nullable String name;
 
+    private final InetAddressResolver addressResolver;
+
+    private final long backgroundReResolveAddressesInterval;
+
     /**
      * Constructor.
      *
@@ -86,7 +91,10 @@ public final class IgniteClientConfigurationImpl implements IgniteClientConfigur
      * @param operationTimeout Operation timeout.
      * @param sqlPartitionAwarenessMetadataCacheSize Size of the cache to store partition awareness metadata.
      * @param name Client name.
+     * @param backgroundReResolveAddressesInterval Background re-resolve addresses interval.
+     * @param addressResolver Address resolver.
      */
+    @VisibleForTesting
     public IgniteClientConfigurationImpl(
             @Nullable IgniteClientAddressFinder addressFinder,
             String[] addresses,
@@ -102,7 +110,9 @@ public IgniteClientConfigurationImpl(
             @Nullable IgniteClientAuthenticator authenticator,
             long operationTimeout,
             int sqlPartitionAwarenessMetadataCacheSize,
-            @Nullable String name
+            @Nullable String name,
+            long backgroundReResolveAddressesInterval,
+            @Nullable InetAddressResolver addressResolver
     ) {
         this.addressFinder = addressFinder;
 
@@ -122,6 +132,66 @@ public IgniteClientConfigurationImpl(
         this.operationTimeout = operationTimeout;
         this.sqlPartitionAwarenessMetadataCacheSize = sqlPartitionAwarenessMetadataCacheSize;
         this.name = name;
+        this.backgroundReResolveAddressesInterval = backgroundReResolveAddressesInterval;
+        this.addressResolver = addressResolver;
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param addressFinder Address finder.
+     * @param addresses Addresses.
+     * @param connectTimeout Socket connect timeout.
+     * @param backgroundReconnectInterval Background reconnect interval.
+     * @param asyncContinuationExecutor Async continuation executor.
+     * @param heartbeatInterval Heartbeat message interval.
+     * @param heartbeatTimeout Heartbeat message timeout.
+     * @param retryPolicy Retry policy.
+     * @param loggerFactory Logger factory which will be used to create a logger instance for this this particular client when
+     *         needed.
+     * @param metricsEnabled Whether metrics are enabled.
+     * @param authenticator Authenticator.
+     * @param operationTimeout Operation timeout.
+     * @param sqlPartitionAwarenessMetadataCacheSize Size of the cache to store partition awareness metadata.
+     * @param name Client name.
+     */
+    public IgniteClientConfigurationImpl(
+            @Nullable IgniteClientAddressFinder addressFinder,
+            String[] addresses,
+            long connectTimeout,
+            long backgroundReconnectInterval,
+            @Nullable Executor asyncContinuationExecutor,
+            long heartbeatInterval,
+            long heartbeatTimeout,
+            @Nullable RetryPolicy retryPolicy,
+            @Nullable LoggerFactory loggerFactory,
+            @Nullable SslConfiguration sslConfiguration,
+            boolean metricsEnabled,
+            @Nullable IgniteClientAuthenticator authenticator,
+            long operationTimeout,
+            int sqlPartitionAwarenessMetadataCacheSize,
+            @Nullable String name,
+            long backgroundReResolveAddressesInterval
+    ) {
+        this(
+                addressFinder,
+                addresses,
+                connectTimeout,
+                backgroundReconnectInterval,
+                asyncContinuationExecutor,
+                heartbeatInterval,
+                heartbeatTimeout,
+                retryPolicy,
+                loggerFactory,
+                sslConfiguration,
+                metricsEnabled,
+                authenticator,
+                operationTimeout,
+                sqlPartitionAwarenessMetadataCacheSize,
+                name,
+                backgroundReResolveAddressesInterval,
+                null
+        );
     }
 
     /** {@inheritDoc} */
@@ -210,4 +280,18 @@ public int sqlPartitionAwarenessMetadataCacheSize() {
     public @Nullable String name() {
         return name;
     }
+
+    @Override
+    public long backgroundReResolveAddressesInterval() {
+        return backgroundReResolveAddressesInterval;
+    }
+
+    /**
+     * Gets custom address resolver.
+     *
+     * @return Custom address resolver.
+     */
+    @Nullable InetAddressResolver addressResolver() {
+        return addressResolver;
+    }
 }

modules/client/src/main/java/org/apache/ignite/internal/client/InetAddressResolver.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.client;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * DNS resolver.
+ */
+@FunctionalInterface
+public interface InetAddressResolver {
+    InetAddressResolver DEFAULT = InetAddress::getAllByName;
+
+    /**
+     * Resolves the given host name to its IP addresses.
+     *
+     * @param host the host name to be resolved
+     * @return an array of {@code InetAddress} objects representing the IP addresses of the host
+     * @throws UnknownHostException if the host name could not be resolved
+     */
+    InetAddress[] getAllByName(String host) throws UnknownHostException;
+}