resolve comments

WeiranFang · WeiranFang · commit bcd4545580a8 · 2020-06-16T15:58:43.000-07:00
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java
@@ -82,9 +82,7 @@ public class EnhancedBigtableStubSettings extends StubSettings<EnhancedBigtableS
   private static final int MAX_MESSAGE_SIZE = 256 * 1024 * 1024;
   private static final String SERVER_DEFAULT_APP_PROFILE_ID = "";
 
-  // TODO(igorbernstein2): Remove this once DirectPath goes to public beta
-  // Temporary endpoint for the DirectPath private alpha
-  private static final String DIRECT_PATH_ENV_VAR = "GOOGLE_CLOUD_ENABLE_DIRECT_PATH";
+  // TODO(weiranf): Remove this temporary endpoint once DirectPath goes to public beta
   private static final String DIRECT_PATH_ENDPOINT = "directpath-bigtable.googleapis.com:443";
 
   private static final Set<Code> IDEMPOTENT_RETRY_CODES =
@@ -229,15 +227,11 @@ public boolean isRefreshingChannel() {
 
   /** Returns a builder for the default ChannelProvider for this service. */
   public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
-    InstantiatingGrpcChannelProvider.Builder builder =
-        BigtableStubSettings.defaultGrpcTransportProviderBuilder()
+    return BigtableStubSettings.defaultGrpcTransportProviderBuilder()
         .setPoolSize(getDefaultChannelPoolSize())
-        .setMaxInboundMessageSize(MAX_MESSAGE_SIZE);
-    // TODO(weiranf): Remove this once DirectPath goes to public beta
-    if (isDirectPathEnabled()) {
-      builder.setAttemptDirectPath(true);
-    }
-    return builder;
+        .setMaxInboundMessageSize(MAX_MESSAGE_SIZE)
+        // TODO(weiranf): Set this to true by default once DirectPath goes to public beta
+        .setAttemptDirectPath(isDirectPathEnabled());
   }
 
   // TODO(weiranf): Remove this once DirectPath goes to public beta
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/DirectPathFallbackIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/DirectPathFallbackIT.java
@@ -39,8 +39,6 @@
 import io.grpc.netty.shaded.io.netty.util.ReferenceCountUtil;
 import java.io.IOException;
 import java.lang.reflect.Field;
-import java.net.Inet4Address;
-import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -68,6 +66,8 @@ public class DirectPathFallbackIT {
   // This was determined experimentally to account for both gRPC-LB RPCs and Bigtable api RPCs.
   private static final int MIN_COMPLETE_READ_CALLS = 40;
   private static final int NUM_RPCS_TO_SEND = 20;
+
+  // IP address prefixes allocated for DirectPath backends.
   private static final String DP_IPV6_PREFIX = "2001:4860:8040";
   private static final String DP_IPV4_PREFIX = "34.126";
 
@@ -233,17 +233,13 @@ public void connect(
       if (remoteAddress instanceof InetSocketAddress) {
         InetAddress inetAddress = ((InetSocketAddress) remoteAddress).getAddress();
         String addr = inetAddress.getHostAddress();
-        if ((inetAddress instanceof Inet6Address && addr.startsWith(DP_IPV6_PREFIX))
-          || (inetAddress instanceof Inet4Address && addr.startsWith(DP_IPV4_PREFIX))) {
-          isDpAddr = true;
-        }
+        isDpAddr = addr.startsWith(DP_IPV6_PREFIX) ||  addr.startsWith(DP_IPV4_PREFIX);
       }
 
       if (!(isDpAddr && blackholeDpAddr.get())) {
         super.connect(ctx, remoteAddress, localAddress, promise);
       } else {
         // Fail the connection fast
-        System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>> Failing connection");
         promise.setFailure(new IOException("fake error"));
       }
     }
@@ -253,7 +249,6 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
       boolean dropCall = isDpAddr && blackholeDpAddr.get();
 
       if (dropCall) {
-        System.out.println(">>>>>>>>>>>>>>>>>>>>>>> Dropping call.");
         // Don't notify the next handler and increment counter
         numBlocked.incrementAndGet();
         ReferenceCountUtil.release(msg);
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/AbstractTestEnv.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/AbstractTestEnv.java
@@ -75,7 +75,7 @@ public boolean isInstanceAdminSupported() {
   }
 
   public boolean isDirectPathEnabled() {
-    return "bigtable".equals(System.getenv("GOOGLE_CLOUD_ENABLE_DIRECT_PATH"));
+    return Boolean.getBoolean("bigtable.attempt-directpath");
   }
 
   public String getPrimaryZone() {

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public boolean isInstanceAdminSupported() {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`public boolean isDirectPathEnabled() {`
`78`		`- return "bigtable".equals(System.getenv("GOOGLE_CLOUD_ENABLE_DIRECT_PATH"));`
	`78`	`+ return Boolean.getBoolean("bigtable.attempt-directpath");`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`public String getPrimaryZone() {`