Merge branch 'main' into postprocessor

Author: jinseopkim0

.github/workflows/hermetic_library_generation.yaml

@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/google-cloud-java/sdk-platform-java/.github/scripts@v1.85.0
+    - uses: googleapis/google-cloud-java/sdk-platform-java/.github/scripts@google-cloud-shared-dependencies/v3.61.0
       if: env.SHOULD_RUN == 'true'
       with:
         image_tag: latest

README.md

@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.79.0')
+implementation platform('com.google.cloud:libraries-bom:26.80.0')
 
 implementation 'com.google.cloud:google-cloud-bigtable'
 ```

generation_config.yaml

@@ -1,6 +1,6 @@
-gapic_generator_version: 2.69.0
-googleapis_commitish: 9a832ccde3f3ca4d4e1c39593b1cbf9aa62a75b3
-libraries_bom_version: 26.79.0
+gapic_generator_version: 2.71.0
+googleapis_commitish: 939ba3bf8408af83f0f73ae35c76c4b11a8c8c8d
+libraries_bom_version: 26.80.0
 template_excludes:
   - .gitignore
   - .kokoro/presubmit/integration.cfg

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/channels/ChannelPoolDpImpl.java

@@ -262,11 +262,16 @@ private void removeGroup(AfeChannelGroup group) {
   }
 
   @GuardedBy("this")
-  private AfeChannelGroup rehomeChannel(ChannelWrapper channelWrapper, AfeId afeId) {
+  private void rehomeChannel(ChannelWrapper channelWrapper, AfeId afeId) {
+    // No need to rehome recycled channels.
+    if (channelWrapper.channel.isShutdown()) {
+      return;
+    }
+
     AfeChannelGroup origGroup = channelWrapper.group;
 
     if (Objects.equals(origGroup.afeId, afeId)) {
-      return origGroup;
+      return;
     }
 
     log(Level.FINE, "Rehoming channel from: %s to %s", origGroup.afeId, afeId);
@@ -291,7 +296,7 @@ private AfeChannelGroup rehomeChannel(ChannelWrapper channelWrapper, AfeId afeId
     newGroup.channels.add(channelWrapper);
     newGroup.numStreams += channelWrapper.numOutstanding;
 
-    return newGroup;
+    return;
   }
 
   // Update accounting when a stream is closed and releases its channel
@@ -322,6 +327,11 @@ private static boolean shouldRecycleChannel(Status status) {
 
   @GuardedBy("this")
   private void recycleChannel(ChannelWrapper channelWrapper) {
+    if (channelWrapper.channel.isShutdown()) {
+      // Channel is already recycled.
+      return;
+    }
+
     channelWrapper.group.channels.remove(channelWrapper);
     channelWrapper.channel.shutdown();
     // Checking for starting group because we don't want to delete the stating group.

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

@@ -324,7 +324,7 @@ VRpc<ReqT, RespT> newCall(VRpcDescriptor<OpenReqT, ReqT, RespT> descriptor) {
 
       long rpcId = nextRpcId;
       nextRpcId = Math.incrementExact(nextRpcId);
-      return new VRpcImpl<>(this, descriptor, rpcId, stream.getPeerInfo());
+      return new VRpcImpl<>(this, descriptor, rpcId, stream.getPeerInfo(), debugTagTracer);
     }
   }
 

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

@@ -111,7 +111,7 @@ public Optional<SessionHandle> checkoutSession(AfeHandle afeHandle) {
         handle -> {
           poolStats.readyCount--;
           poolStats.inUseCount++;
-
+          inUseSessions.add(handle);
           if (handle.afe.get().sessions.isEmpty()) {
             afesWithReadySessions.remove(afeHandle);
           }
@@ -194,11 +194,6 @@ void onSessionStarted() {
       poolStats.readyCount++;
     }
 
-    void onVRpcStarted() {
-      // Pool stats and AFE list are updated in SessionList#checkoutSession
-      inUseSessions.add(this);
-    }
-
     /**
      * The session is returned to the pool after use. This undoes what SessionList#checkoutSession
      */

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

@@ -534,7 +534,6 @@ private void tryDrainPendingRpcs() {
       if (!handle.isPresent()) {
         break;
       }
-      handle.get().onVRpcStarted();
       PendingVRpc<?, ?> rpc = pendingRpcs.removeFirst();
       rpc.drainTo(handle.get());
     }

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

@@ -20,6 +20,7 @@
 import com.google.bigtable.v2.VirtualRpcRequest;
 import com.google.bigtable.v2.VirtualRpcRequest.Metadata;
 import com.google.bigtable.v2.VirtualRpcResponse;
+import com.google.cloud.bigtable.data.v2.internal.csm.tracers.DebugTagTracer;
 import com.google.cloud.bigtable.data.v2.internal.middleware.VRpc;
 import com.google.protobuf.Message;
 import com.google.protobuf.MessageLite;
@@ -72,16 +73,20 @@ private enum State {
 
   private AtomicReference<State> state;
 
+  private final DebugTagTracer debugTagTracer;
+
   public VRpcImpl(
       VRpcSessionApi session,
       VRpcDescriptor<OpenReqT, ReqT, RespT> desc,
       long rpcId,
-      PeerInfo peerInfo) {
+      PeerInfo peerInfo,
+      DebugTagTracer debugTagTracer) {
     this.session = session;
     this.desc = desc;
     this.rpcId = rpcId;
     this.state = new AtomicReference<>(State.NEW);
     this.peerInfo = peerInfo;
+    this.debugTagTracer = debugTagTracer;
   }
 
   @Override
@@ -96,6 +101,8 @@ public void start(ReqT req, VRpcCallContext ctx, VRpcListener<RespT> listener) {
       retryable = false;
     } else if (ctx.getOperationInfo().getDeadline().timeRemaining(TimeUnit.MICROSECONDS)
         < TimeUnit.MILLISECONDS.toMicros(1)) {
+      // transitioning to the close state is handled below
+      state.set(State.STARTED);
       // Don't send RPCs that don't have any hope of succeeding
       status =
           Status.DEADLINE_EXCEEDED.withDescription("Remaining deadline is too short to send RPC");
@@ -124,9 +131,11 @@ public void start(ReqT req, VRpcCallContext ctx, VRpcListener<RespT> listener) {
     }
 
     if (!status.isOk()) {
-      if (!state.compareAndSet(State.STARTED, State.CLOSED)) {
-        return;
-      }
+      debugTagTracer.checkPrecondition(
+          state.compareAndSet(State.STARTED, State.CLOSED),
+          "vrpc_incorrect_start_state",
+          "VRpc has incorrect state. Expected to be started but was %s",
+          state);
       // TODO: loop through the session executor
       if (retryable) {
         listener.onClose(VRpcResult.createUncommitedError(status));

google-cloud-bigtable/src/main/resources/META-INF/native-image/com.google.cloud.bigtable.admin.v2/reflect-config.json

@@ -1871,6 +1871,15 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.bigtable.admin.v2.Instance$Edition",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.bigtable.admin.v2.Instance$State",
     "queryAllDeclaredConstructors": true,

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClientTest.java

@@ -475,6 +475,7 @@ public void updateInstanceTest() throws Exception {
     Assert.assertEquals(request.getDisplayName(), actualRequest.getDisplayName());
     Assert.assertEquals(request.getState(), actualRequest.getState());
     Assert.assertEquals(request.getType(), actualRequest.getType());
+    Assert.assertEquals(request.getEdition(), actualRequest.getEdition());
     Assert.assertEquals(request.getLabelsMap(), actualRequest.getLabelsMap());
     Assert.assertEquals(request.getCreateTime(), actualRequest.getCreateTime());
     Assert.assertEquals(request.getSatisfiesPzs(), actualRequest.getSatisfiesPzs());