Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.

Commit 053b535

Browse files
Merge branch 'main' into generate-libraries-main
2 parents f5aeb4b + b01e8ec commit 053b535

4 files changed

Lines changed: 15 additions & 5 deletions

File tree

.kokoro/presubmit/integration.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env_vars: {
88

99
env_vars: {
1010
key: "INTEGRATION_TEST_ARGS"
11-
value: "-P bigtable-emulator-it,bigtable-prod-it,bigtable-prod-batch-it,enable-verbose-grpc-logs -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable -Dbigtable.table=integration-tests -Dbigtable.kms_key_name=projects/gcloud-devel/locations/us-east1/keyRings/cmek-test-key-ring/cryptoKeys/cmek-test-key -Dbigtable.wait-for-cmek-key-status=true"
11+
value: "-P bigtable-prod-it,enable-verbose-grpc-logs -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable -Dbigtable.table=integration-tests -Dbigtable.kms_key_name=projects/gcloud-devel/locations/us-east1/keyRings/cmek-test-key-ring/cryptoKeys/cmek-test-key -Dbigtable.wait-for-cmek-key-status=true"
1212
}
1313

1414
env_vars: {

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/session/SessionPoolImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ private int getMaxConsecutiveFailures(ClientConfigurationManager configManager)
325325

326326
private synchronized void createSession(OpenParams openParams) {
327327
if (!budget.tryReserveSession()) {
328-
debugTagTracer.record(TelemetryConfiguration.Level.DEBUG, "session_pool_no_budget");
328+
debugTagTracer.record(TelemetryConfiguration.Level.WARN, "session_pool_no_budget");
329329
logger.fine(
330330
String.format(
331331
"Refusing to add a new session due to exhausted %s concurrent create session"

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,10 @@ public class EnhancedBigtableStubSettings extends StubSettings<EnhancedBigtableS
100100

101101
// TODO change this to true when enabling directpath by default
102102
// For now, Only runs Direct Access Checker if user explicitly sets CBT_ENABLE_DIRECTPATH=true
103-
private static final DirectPathConfig DIRECT_PATH_CONFIG =
104-
Optional.ofNullable(System.getenv("CBT_ENABLE_DIRECTPATH"))
103+
private static DirectPathConfig DIRECT_PATH_CONFIG =
104+
Optional.ofNullable(
105+
Optional.ofNullable(System.getenv("CBT_ENABLE_DIRECTPATH"))
106+
.orElse(System.getProperty("bigtable.internal.enable-directpath")))
105107
.map(Boolean::parseBoolean)
106108
.map(b -> b ? DirectPathConfig.FORCED_ON : DirectPathConfig.FORCED_OFF)
107109
.orElse(DirectPathConfig.DEFAULT);

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/session/SessionImplTest.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,15 @@ void testHeartbeat() throws Exception {
443443
SessionParametersResponse.newBuilder()
444444
.setKeepAlive(Durations.fromMillis(keepAliveDurationMs))
445445
.build())
446-
.putVrpcActions(0, ActionList.getDefaultInstance())
446+
.putVrpcActions(
447+
0,
448+
ActionList.newBuilder()
449+
.addActions(
450+
Action.newBuilder()
451+
.setDelay(Durations.fromMillis(500))
452+
.setResponse(VirtualRpcResponse.getDefaultInstance())
453+
.build())
454+
.build())
447455
.build()
448456
.toByteString())
449457
.build();

0 commit comments

Comments
 (0)