From 152bfeb747200df8b7da29f809d5b8c2265cf7dd Mon Sep 17 00:00:00 2001 From: mohanli-ml Date: Wed, 22 Nov 2023 18:56:14 +0000 Subject: [PATCH 1/3] feat: allow non default service account in DirectPath --- .../bigtable/data/v2/stub/EnhancedBigtableStubSettings.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 cffd9c85df..9a254100a5 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 @@ -329,7 +329,10 @@ public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProvi Duration.ofSeconds(10)) // wait this long before considering the connection dead // Attempts direct access to CBT service over gRPC to improve throughput, // whether the attempt is allowed is totally controlled by service owner. - .setAttemptDirectPath(true); + .setAttemptDirectPath(true) + // Allow using non-default service account in DirectPath. + .setAllowNonDefaultServiceAccount(true); + } @SuppressWarnings("WeakerAccess") From c04418021dcce7c659e33ff5a11a78773bcf44a6 Mon Sep 17 00:00:00 2001 From: mohanli-ml Date: Wed, 22 Nov 2023 19:04:28 +0000 Subject: [PATCH 2/3] feat: allow non default service account in DirectPath --- .../bigtable/data/v2/stub/EnhancedBigtableStubSettings.java | 4 +--- 1 file changed, 1 insertion(+), 3 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 9a254100a5..8ce0898286 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 @@ -332,7 +332,6 @@ public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProvi .setAttemptDirectPath(true) // Allow using non-default service account in DirectPath. .setAllowNonDefaultServiceAccount(true); - } @SuppressWarnings("WeakerAccess") @@ -657,8 +656,7 @@ private Builder() { sampleRowKeysSettings .setRetryableCodes(IDEMPOTENT_RETRY_CODES) .setRetrySettings( - IDEMPOTENT_RETRY_SETTINGS - .toBuilder() + IDEMPOTENT_RETRY_SETTINGS.toBuilder() .setInitialRpcTimeout(Duration.ofMinutes(5)) .setMaxRpcTimeout(Duration.ofMinutes(5)) .build()); From d2f1623172db84eb7a9e804ee6ec0104f0d258e7 Mon Sep 17 00:00:00 2001 From: mohanli-ml Date: Wed, 22 Nov 2023 19:11:24 +0000 Subject: [PATCH 3/3] feat: allow non default service account in DirectPath --- .../bigtable/data/v2/stub/EnhancedBigtableStubSettings.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 8ce0898286..eb68404bb3 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 @@ -656,7 +656,8 @@ private Builder() { sampleRowKeysSettings .setRetryableCodes(IDEMPOTENT_RETRY_CODES) .setRetrySettings( - IDEMPOTENT_RETRY_SETTINGS.toBuilder() + IDEMPOTENT_RETRY_SETTINGS + .toBuilder() .setInitialRpcTimeout(Duration.ofMinutes(5)) .setMaxRpcTimeout(Duration.ofMinutes(5)) .build());