Rename EtcdNameResolver to IPNameResolver

etcd-io · Aug 28, 2020 · 6ed4f1f · 6ed4f1f
1 parent ee0153b
commit 6ed4f1f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 28 deletions.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/ClientConnectionManager.java b/jetcd-core/src/main/java/io/etcd/jetcd/ClientConnectionManager.java
@@ -30,7 +30,6 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -41,10 +40,9 @@
 import io.etcd.jetcd.api.AuthGrpc;
 import io.etcd.jetcd.api.AuthenticateRequest;
 import io.etcd.jetcd.api.AuthenticateResponse;
-import io.etcd.jetcd.common.exception.ErrorCode;
 import io.etcd.jetcd.common.exception.EtcdExceptionFactory;
 import io.etcd.jetcd.resolver.DnsSrvNameResolver;
-import io.etcd.jetcd.resolver.EtcdNameResolver;
+import io.etcd.jetcd.resolver.IPNameResolver;
 import io.grpc.CallOptions;
 import io.grpc.Channel;
 import io.grpc.ClientCall;
@@ -62,15 +60,16 @@
 import io.netty.channel.ChannelOption;
 import net.jodah.failsafe.Failsafe;
 import net.jodah.failsafe.RetryPolicy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.etcd.jetcd.Util.isInvalidTokenError;
 import static io.etcd.jetcd.common.exception.EtcdExceptionFactory.handleInterrupt;
-import static io.etcd.jetcd.common.exception.EtcdExceptionFactory.newEtcdException;
 import static io.etcd.jetcd.common.exception.EtcdExceptionFactory.toEtcdException;
 
 final class ClientConnectionManager {
-
+    private static final Logger LOGGER = LoggerFactory.getLogger(ClientConnectionManager.class);
     private static final Metadata.Key<String> TOKEN = Metadata.Key.of("token", Metadata.ASCII_STRING_MARSHALLER);
 
     private final Object lock;
@@ -221,13 +220,16 @@ protected ManagedChannelBuilder<?> defaultChannelBuilder(Collection<URI> endpoin
         } else {
             target = String.format(
                 "%s://%s/%s",
-                EtcdNameResolver.SCHEME,
+                IPNameResolver.SCHEME,
                 builder.authority() != null ? builder.authority() : "",
                 endpoints.stream().map(e -> e.getHost() + ":" + e.getPort()).collect(Collectors.joining(",")));
         }
 
         final NettyChannelBuilder channelBuilder = NettyChannelBuilder.forTarget(target);
 
+        if (builder.authority() != null) {
+            channelBuilder.overrideAuthority(builder.authority());
+        }
         if (builder.maxInboundMessageSize() != null) {
             channelBuilder.maxInboundMessageSize(builder.maxInboundMessageSize());
         }
@@ -326,12 +328,13 @@ public <S, T> CompletableFuture<T> execute(Callable<ListenableFuture<S>> task, F
      * @return               a CompletableFuture with type T.
      */
     @SuppressWarnings("FutureReturnValueIgnored")
-    public <S, T> CompletableFuture<T> execute(Callable<ListenableFuture<S>> task,
+    public <S, T> CompletableFuture<T> execute(
+        Callable<ListenableFuture<S>> task,
         Function<S, T> resultConvert,
         Predicate<Throwable> doRetry) {
 
         RetryPolicy<CompletableFuture<S>> retryPolicy = new RetryPolicy<CompletableFuture<S>>().handleIf(doRetry)
-            .onRetriesExceeded(e -> newEtcdException(ErrorCode.ABORTED, "maximum number of auto retries reached"))
+            .onRetriesExceeded(e -> LOGGER.warn("maximum number of auto retries reached"))
             .withBackoff(builder.retryDelay(), builder.retryMaxDelay(), builder.retryChronoUnit());
 
         if (builder.retryMaxDuration() != null) {

diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/resolver/DnsSrvNameResolver.java b/jetcd-core/src/main/java/io/etcd/jetcd/resolver/DnsSrvNameResolver.java
@@ -33,7 +33,6 @@
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
-import com.google.common.base.Strings;
 import io.etcd.jetcd.common.exception.ErrorCode;
 import io.etcd.jetcd.common.exception.EtcdExceptionFactory;
 import io.grpc.EquivalentAddressGroup;
@@ -141,11 +140,7 @@ private void doResolve() {
                 //
                 groups.add(new EquivalentAddressGroup(
                     address,
-                    Strings.isNullOrEmpty(authority)
-                        ? io.grpc.Attributes.newBuilder()
-                            .set(EquivalentAddressGroup.ATTR_AUTHORITY_OVERRIDE, targetUri.getAuthority())
-                            .build()
-                        : io.grpc.Attributes.EMPTY));
+                    io.grpc.Attributes.EMPTY));
             }
 
             if (groups.isEmpty()) {

diff --git a/...etcd/jetcd/resolver/EtcdNameResolver.java → ...o/etcd/jetcd/resolver/IPNameResolver.java b/...etcd/jetcd/resolver/EtcdNameResolver.java → ...o/etcd/jetcd/resolver/IPNameResolver.java
@@ -27,7 +27,6 @@
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
-import com.google.common.base.Strings;
 import com.google.common.collect.Iterables;
 import io.etcd.jetcd.common.exception.ErrorCode;
 import io.etcd.jetcd.common.exception.EtcdExceptionFactory;
@@ -39,10 +38,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class EtcdNameResolver extends NameResolver {
-    public static final String SCHEME = "etcd";
+public class IPNameResolver extends NameResolver {
+    public static final String SCHEME = "ip";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(EtcdNameResolver.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(IPNameResolver.class);
     private static final String ETCD_CLIENT_PORT = "2379";
 
     private final Object lock;
@@ -58,7 +57,7 @@ public class EtcdNameResolver extends NameResolver {
     @GuardedBy("lock")
     private Listener listener;
 
-    public EtcdNameResolver(URI targetUri) {
+    public IPNameResolver(URI targetUri) {
         this.lock = new Object();
         this.targetUri = targetUri;
         this.authority = targetUri.getAuthority() != null ? targetUri.getAuthority() : SCHEME;
@@ -76,11 +75,7 @@ public EtcdNameResolver(URI targetUri) {
             }).map(address -> {
                 return new EquivalentAddressGroup(
                     address,
-                    Strings.isNullOrEmpty(authority)
-                        ? io.grpc.Attributes.newBuilder()
-                            .set(EquivalentAddressGroup.ATTR_AUTHORITY_OVERRIDE, targetUri.getAuthority())
-                            .build()
-                        : io.grpc.Attributes.EMPTY);
+                    io.grpc.Attributes.EMPTY);
             }).collect(Collectors.toList());
     }
 

diff --git a/.../jetcd/resolver/EtcdResolverProvider.java → ...cd/jetcd/resolver/IPResolverProvider.java b/.../jetcd/resolver/EtcdResolverProvider.java → ...cd/jetcd/resolver/IPResolverProvider.java
@@ -25,7 +25,7 @@
 import io.grpc.NameResolverProvider;
 
 @AutoService(NameResolverProvider.class)
-public class EtcdResolverProvider extends NameResolverProvider {
+public class IPResolverProvider extends NameResolverProvider {
     @Override
     protected boolean isAvailable() {
         return true;
@@ -38,14 +38,14 @@ protected int priority() {
 
     @Override
     public String getDefaultScheme() {
-        return EtcdNameResolver.SCHEME;
+        return IPNameResolver.SCHEME;
     }
 
     @Nullable
     @Override
     public NameResolver newNameResolver(URI targetUri, NameResolver.Args args) {
-        return EtcdNameResolver.SCHEME.equals(targetUri.getScheme())
-            ? new EtcdNameResolver(targetUri)
+        return IPNameResolver.SCHEME.equals(targetUri.getScheme())
+            ? new IPNameResolver(targetUri)
             : null;
     }
 }