Sandbox::https://github.com/googleapis/google-cloud-java/pull/14912

igorbernstein2 · 2026-11-03T18:36:18Z

Summary

When session_load == 0 across all scopes, ClientConfigurationManager.normalizeConfig clears session_configuration, resulting in an empty SessionPoolConfiguration.getDefaultInstance().

This change updates PoolSizer and SessionPoolImpl to handle an empty SessionPoolConfiguration cleanly:

PoolSizer:
- Guards pendingVRpcsPerSession > 0 in getScaleDelta() to prevent divide-by-zero (+Infinity -> Integer.MAX_VALUE and int overflow when inUseCount >= 1).
- Updates handleGoAway and handleSessionClose from getScaleDelta() >= 0 to getScaleDelta() > 0 (since onSessionClosing / onSessionClosed already decrements expectedCapacity prior to consulting PoolSizer).
SessionPoolImpl & SessionList:
- Guards maybeScheduleCreateSessionRetry() with budget.getMaxConcurrentRequest() <= 0 so it does not spin on a 1ms retry timer when budget == 0.
- Makes SessionHandle.onSessionClosing() idempotent with respect to expectedCapacity.
- In the config listener, when newConfig is SessionPoolConfiguration.getDefaultInstance(), cancels retryCreateSessionFuture and gracefully closes all sessions (CLOSE_SESSION_REASON_DOWNSIZE); when newConfig is non-empty and poolState == PoolState.STARTED, scales back up via the pre-start loop.

…pl and PoolSizer

gemini-code-assist

Code Review

This pull request adds robust handling for empty or disabled session pool configurations in the Google Cloud Bigtable client. Key changes include preventing division-by-zero errors in PoolSizer when pendingVRpcsPerSession is zero, updating SessionPoolImpl to properly cancel retry futures and close active sessions when the configuration is reset to default, and adding corresponding unit tests. The review feedback correctly identifies a compilation error in SessionPoolImpl.java where Future.cancel() is called without its required boolean argument, and suggests using cancel(false) instead.

…ion handling

…ration is disabled

mutianf · 2026-11-10T15:07:20Z


      poolStats.startingCount--;
-      poolStats.readyCount++;
+      if (inExpectedCount) {


do we need to set this to false after incrementing readyCount?

no, that field name is misleading. I renamed it to closing

mutianf · 2026-11-10T15:07:37Z

      inUseSessions.remove(this);

-      if (session.getState() == SessionState.READY) {
+      if (inExpectedCount && session.getState() == SessionState.READY) {


same question here

mutianf · 2026-11-10T15:16:20Z

  @GuardedBy("poolLock")
  private void maybeScheduleCreateSessionRetry() {
-    if (retryCreateSessionFuture != null) {
+    if (retryCreateSessionFuture != null || budget.getMaxConcurrentRequest() <= 0) {


would it be better to set a sessionDisabled flag? instead of checking specific params?

good idea, centralized the logic

…poolSizer.isDisabled()

…rk disabled volatile

mutianf · 2026-11-10T20:08:41Z

/gemini review

gemini-code-assist

Code Review

This pull request introduces support for dynamically disabling the session pool configuration, gracefully handling transitions to an empty or disabled state by closing active sessions, cancelling pending RPCs, and rejecting new calls. It also addresses potential race conditions during session startup and closing by replacing the inExpectedCount flag with a closing state, and fixes potential division-by-zero errors in the pool sizer. However, there are critical compilation errors in SessionPoolImpl.java where cancel() is called without the required boolean argument on Future objects (retryCreateSessionFuture and deadlineMonitor). These must be updated to cancel(false) to resolve the build failures.

gemini-code-assist · 2026-11-10T20:10:25Z

                picker.updateConfig(newConfig);
+                if (poolSizer.isDisabled()) {
+                  if (retryCreateSessionFuture != null) {
+                    retryCreateSessionFuture.cancel();


Calling cancel() with no arguments on retryCreateSessionFuture (which is a ScheduledFuture or Future) will cause a compilation error in Java. The Future.cancel method requires a boolean parameter indicating whether to interrupt the running thread. Please use cancel(false) instead.

Suggested change

retryCreateSessionFuture.cancel();

retryCreateSessionFuture.cancel(false);

gemini-code-assist · 2026-11-10T20:10:25Z

    @SuppressWarnings("GuardedBy")
    private void cancel(Status status, boolean onlyCancelPendingCall) {
+      if (deadlineMonitor != null) {
+        deadlineMonitor.cancel();


Calling cancel() with no arguments on deadlineMonitor (which is a ScheduledFuture or Future) will cause a compilation error in Java. The Future.cancel method requires a boolean parameter. Please use cancel(false) instead.

Suggested change

deadlineMonitor.cancel();

deadlineMonitor.cancel(false);

gemini-code-assist · 2026-11-10T20:10:25Z


    void cancelWithResult(VRpcResult result) {
+      if (deadlineMonitor != null) {
+        deadlineMonitor.cancel();


Calling cancel() with no arguments on deadlineMonitor (which is a ScheduledFuture or Future) will cause a compilation error in Java. The Future.cancel method requires a boolean parameter. Please use cancel(false) instead.

Suggested change

deadlineMonitor.cancel();

deadlineMonitor.cancel(false);

…or to *Timeout

🤖 I have created a release *beep* *boop* --- <details><summary>1.97.0</summary> ## [1.97.0](v1.96.0...v1.97.0) (2026-11-12) ### ⚠ BREAKING CHANGES * **shopping-merchant:** remove discontinued Merchant API v1beta ([#14942](#14942)) ### Features * **bigquery-jdbc:** adds BigQuery graph integration to DatabaseMetadata methods ([#14930](#14930)) ([950b81b](950b81b)) * **gax:** implement resumable upload session resumption ([#14677](#14677)) ([24728d6](24728d6)) * **grpc-gcp:** add built-in channel_count metric for client library pools ([#14947](#14947)) ([712f043](712f043)) * **grpc-gcp:** add built-in channel_load metric for client library pools ([#14985](#14985)) ([9f87888](9f87888)) * **shopping-merchant:** remove discontinued Merchant API v1beta ([#14942](#14942)) ([2947dfd](2947dfd)) * **storage:** add StorageErrorTypeMapper for standard metrics ([#14694](#14694)) ([a9ac393](a9ac393)) * **storage:** add StorageMetricsContext for operation metrics state ([#14728](#14728)) ([edea395](edea395)) * **storage:** wire logical operation metrics in Retrying and StorageOptions ([#14695](#14695)) ([589c66c](589c66c)) * update API sources and regenerate ([#14958](#14958)) ([75944f3](75944f3)) ### Bug Fixes * **auth:** verify public/private key match with retries in mTLS keystore loading ([#14829](#14829)) ([096dbd6](096dbd6)) * **bigquery:** set QueryResultsFormat.ARROW in QueryArrow sample ([#14960](#14960)) ([c98e7c3](c98e7c3)) * **bigtable:** avoid triggering per-RPC credential session fallback on default call context ([#14961](#14961)) ([eb06d2c](eb06d2c)) * **bigtable:** copy Metadata per GetClientConfiguration call ([#14950](#14950)) ([278fe2f](278fe2f)) * **bigtable:** disable SwitchingChannelPool when ChannelPoolConfiguration is empty ([#14911](#14911)) ([fa24702](fa24702)) * **bigtable:** handle empty SessionPoolConfiguration in SessionPoolImpl and PoolSizer ([#14912](#14912)) ([cc7b235](cc7b235)) * **bigtable:** replace SessionPoolImpl Watchdog with per-session closeTimeout ([#14977](#14977)) ([a15acfb](a15acfb)) * **spanner-jdbc:** report database default isolation level ([#14929](#14929)) ([7e7595a](7e7595a)) * **spanner:** fix PG SHOW isolation level statements ([#14904](#14904)) ([bc917ed](bc917ed)) ### Dependencies * bump grpc to 1.85.1, opentelemetry to 1.67.0, and guava to 33.7.2-jre ([#14957](#14957)) ([1a27a00](1a27a00)) * bump guava to 33.7.1-jre and jspecify to 1.0.1 ([#14937](#14937)) ([1441527](1441527)) ### Documentation * **spanner:** update CHANGELOG.md for java spanner releases ([#14935](#14935)) ([956681e](956681e)) * **storage:** add Rapid Cache samples ([#14886](#14886)) ([e714f62](e714f62)) </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

fix(bigtable): handle empty SessionPoolConfiguration in SessionPoolIm…

90a7217

…pl and PoolSizer

igorbernstein2 requested review from a team as code owners November 3, 2026 18:36

gemini-code-assist Bot reviewed Nov 3, 2026

View reviewed changes

Comment thread ...gtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/session/SessionPoolImpl.java Resolved

nimf reviewed Nov 3, 2026

View reviewed changes

fix(bigtable): address review feedback on empty SessionPoolConfigurat…

a86f250

…ion handling

nimf approved these changes Nov 9, 2026

View reviewed changes

igorbernstein2 added 2 commits November 9, 2026 16:05

fmt

1242426

fix(bigtable): guard budget and pending vRPCs when SessionPoolConfigu…

8f7bbe6

…ration is disabled

mutianf approved these changes Nov 10, 2026

View reviewed changes

refactor(bigtable): rename inExpectedCount to closing and centralize …

eb7e4d3

…poolSizer.isDisabled()

mutianf approved these changes Nov 10, 2026

View reviewed changes

fix(bigtable): update removeUnstartedHandle for closing rename and ma…

53b57b3

…rk disabled volatile

mutianf approved these changes Nov 10, 2026

View reviewed changes

gemini-code-assist Bot reviewed Nov 10, 2026

View reviewed changes

refactor(bigtable): rename retryCreateSessionFuture and deadlineMonit…

40aa070

…or to *Timeout

igorbernstein2 enabled auto-merge (squash) November 10, 2026 20:40

igorbernstein2 merged commit cc7b235 into main Nov 10, 2026
208 checks passed

igorbernstein2 deleted the fix-session-pool-disabled-config branch November 10, 2026 21:02

release-please Bot mentioned this pull request Nov 12, 2026

chore(main): release 1.97.0 #14996

Merged

	retryCreateSessionFuture.cancel();
	retryCreateSessionFuture.cancel(false);

Conversation

igorbernstein2 commented Nov 3, 2026

Summary

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mutianf Nov 10, 2026

Choose a reason for hiding this comment

Uh oh!

igorbernstein2 Nov 10, 2026

Choose a reason for hiding this comment

Uh oh!

mutianf Nov 10, 2026

Choose a reason for hiding this comment

Uh oh!

igorbernstein2 Nov 10, 2026

Choose a reason for hiding this comment

Uh oh!

mutianf Nov 10, 2026

Choose a reason for hiding this comment

Uh oh!

igorbernstein2 Nov 10, 2026

Choose a reason for hiding this comment

Uh oh!

mutianf commented Nov 10, 2026

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist Bot Nov 10, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Nov 10, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Nov 10, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants