diff --git a/java-bigtable/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/channels/ChannelPoolDpImpl.java b/java-bigtable/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/channels/ChannelPoolDpImpl.java index 1ef72a91937a..c5157de5ab5b 100644 --- a/java-bigtable/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/channels/ChannelPoolDpImpl.java +++ b/java-bigtable/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/channels/ChannelPoolDpImpl.java @@ -308,6 +308,7 @@ public synchronized SessionStream newStream( return new SessionStreamImpl(innerCall) { // null until onBeforeSessionStart fires @Nullable AfeId afeId = null; + boolean sessionEstablished = false; @Override public void start(Listener responseListener, Metadata headers) { @@ -317,8 +318,6 @@ public void start(Listener responseListener, Metadata headers) { public void onBeforeSessionStart(PeerInfo peerInfo) { afeId = AfeId.extract(peerInfo); synchronized (ChannelPoolDpImpl.this) { - fw.consecutiveFailures = 0; - recycleBackoff = INITIAL_RECYCLE_BACKOFF; sessionsPerAfeId.add(afeId); if (!fw.channel.isShutdown()) { routeObservations.put(new RouteKey(fw.id, tenant), afeId); @@ -328,13 +327,32 @@ public void onBeforeSessionStart(PeerInfo peerInfo) { super.onBeforeSessionStart(peerInfo); } + @Override + public void onMessage(SessionResponse msg) { + if (!sessionEstablished && msg.hasOpenSession()) { + synchronized (ChannelPoolDpImpl.this) { + sessionEstablished = true; + fw.consecutiveFailures = 0; + recycleBackoff = INITIAL_RECYCLE_BACKOFF; + } + } + super.onMessage(msg); + } + @Override public void onClose(Status status, Metadata trailers) { synchronized (ChannelPoolDpImpl.this) { if (afeId != null) { sessionsPerAfeId.remove(afeId); - } else if (!status.isOk() && status.getCode() != Code.CANCELLED) { + } + if (status.isOk()) { + fw.consecutiveFailures = 0; + recycleBackoff = INITIAL_RECYCLE_BACKOFF; + } else if (!sessionEstablished && status.getCode() != Code.CANCELLED) { fw.consecutiveFailures++; + if (afeId != null) { + routeObservations.remove(new RouteKey(fw.id, tenant), afeId); + } } releaseChannel(fw, status); } diff --git a/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/channels/ChannelPoolDpImplTest.java b/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/channels/ChannelPoolDpImplTest.java index 4efca0494718..d1e8afb38d2b 100644 --- a/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/channels/ChannelPoolDpImplTest.java +++ b/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/channels/ChannelPoolDpImplTest.java @@ -632,4 +632,35 @@ void testRecycleChannelBackoff() { pool.close(); } + + @Test + void testPreOpenSessionFailureWithPeerInfoIncrementsFailures() { + when(channelSupplier.get()).thenReturn(channel); + when(channel.newCall(any(), any())).thenReturn(clientCall); + doNothing().when(clientCall).start(listener.capture(), any()); + doReturn(Attributes.EMPTY).when(clientCall).getAttributes(); + + ChannelPoolDpImpl pool = + new ChannelPoolDpImpl(channelSupplier, defaultConfig, debugTagTracer, bgExecutor); + + PeerInfo peerInfo = PeerInfo.newBuilder().setApplicationFrontendId(555).build(); + Metadata headers = new Metadata(); + headers.put( + SessionStreamImpl.PEER_INFO_KEY, + Base64.getEncoder().encodeToString(peerInfo.toByteArray())); + + // 5 pre-OpenSessionResponse rejections (onHeaders with PeerInfo followed by onClose(!OK) + // without OpenSessionResponse) must count as consecutive failures and recycle the channel. + for (int i = 0; i < 5; i++) { + pool.newStream(FakeSessionGrpc.getOpenSessionMethod(), CallOptions.DEFAULT) + .start(mock(Listener.class), new Metadata()); + listener.getValue().onHeaders(headers); + listener.getValue().onClose(Status.RESOURCE_EXHAUSTED, new Metadata()); + } + + verify(channel, times(1)).shutdown(); + verify(channelSupplier, times(2)).get(); + + pool.close(); + } }