From b33b0fc1b5478934298db317c1168c1e9dc20599 Mon Sep 17 00:00:00 2001
From: Weiran Fang <8175562+WeiranFang@users.noreply.github.com>
Date: Tue, 10 Nov 2020 15:16:44 -0800
Subject: [PATCH] Revert "feat: attemp DirectPath by default (#467)" (#520)

This reverts commit 89c622da6038067892687af3edafae743465eda7.
---
 .../v2/stub/EnhancedBigtableStubSettings.java | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

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
index 3ea920752..0ce05d3a5 100644
--- 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
@@ -89,6 +89,9 @@ 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(weiranf): Remove this temporary endpoint once DirectPath goes to public beta
+  private static final String DIRECT_PATH_ENDPOINT = "test-bigtable.sandbox.googleapis.com:443";
+
   private static final Set<Code> IDEMPOTENT_RETRY_CODES =
       ImmutableSet.of(Code.DEADLINE_EXCEEDED, Code.UNAVAILABLE);
 
@@ -167,6 +170,12 @@ public class EnhancedBigtableStubSettings extends StubSettings<EnhancedBigtableS
   private EnhancedBigtableStubSettings(Builder builder) {
     super(builder);
 
+    if (DIRECT_PATH_ENDPOINT.equals(builder.getEndpoint())) {
+      logger.warning(
+          "Connecting to Bigtable using DirectPath."
+              + " This is currently an experimental feature and should not be used in production.");
+    }
+
     // Since point reads, streaming reads, bulk reads share the same base callable that converts
     // grpc errors into ApiExceptions, they must have the same retry codes.
     Preconditions.checkState(
@@ -240,9 +249,13 @@ public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProvi
         .setKeepAliveTimeout(
             Duration.ofSeconds(10)) // wait this long before considering the connection dead
         .setKeepAliveWithoutCalls(true) // sends ping without active streams
-        // Attempts direct access to CBT service over gRPC to improve throughput,
-        // whether the attempt is allowed is totally controlled by service owner.
-        .setAttemptDirectPath(true);
+        // 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
+  private static boolean isDirectPathEnabled() {
+    return Boolean.getBoolean("bigtable.attempt-directpath");
   }
 
   static int getDefaultChannelPoolSize() {
@@ -517,7 +530,13 @@ private Builder() {
       // Defaults provider
       BigtableStubSettings.Builder baseDefaults = BigtableStubSettings.newBuilder();
 
-      setEndpoint(baseDefaults.getEndpoint());
+      // TODO(weiranf): remove this once DirectPath goes to public Beta and uses the default
+      // endpoint.
+      if (isDirectPathEnabled()) {
+        setEndpoint(DIRECT_PATH_ENDPOINT);
+      } else {
+        setEndpoint(baseDefaults.getEndpoint());
+      }
 
       setTransportChannelProvider(defaultTransportChannelProvider());
       setStreamWatchdogCheckInterval(baseDefaults.getStreamWatchdogCheckInterval());