bunch of changes

Author: neilw4

.mvn/extensions.xml

@@ -0,0 +1,9 @@
+<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" 
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+            xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
+    <extension>
+        <groupId>org.apache.maven.extensions</groupId>
+        <artifactId>maven-build-cache-extension</artifactId>
+        <version>1.2.3</version>
+    </extension>
+</extensions>

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

@@ -57,6 +57,8 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.GuardedBy;
 
+// TODO: more aggressively create new channels to catch new AFEs
+
 /**
  * Proof of concept channel pool that avoids parallel channels to the same afe. The pool is
  * dynamically sized based on outstanding streams and tries to limit each channel to at most 10
@@ -76,7 +78,7 @@ public class ChannelPoolDpImpl implements ChannelPool {
 
   @VisibleForTesting volatile int minGroups = 2;
   @VisibleForTesting volatile int maxGroups = 50;
-  @VisibleForTesting volatile int softMaxPerGroup = 5;
+  @VisibleForTesting volatile int softMaxPerGroup = 8;
 
   private final Clock clock;
   private final Supplier<ManagedChannel> channelSupplier;
@@ -476,7 +478,8 @@ private synchronized void serviceChannelsSafe() {
       }
     } else if (desiredGroups > channelGroups.size() + startingGroup.channels.size()) {
       log(Level.FINE, "Adding %d channels", desiredGroups - channelGroups.size());
-      for (int i = channelGroups.size(); i < desiredGroups; i++) {
+      int desiredExtraGroups = desiredGroups - channelGroups.size();
+      for (int i = 0; i < desiredExtraGroups * softMaxPerGroup; i++) {
         addChannel();
       }
     }
@@ -539,6 +542,7 @@ static class AfeChannelGroup {
     private int numStreams;
     private Optional<Float> ewma_network_latency_ms = Optional.empty();
     private Optional<Float> traffic_weight = Optional.empty();
+    // TODO: we probably don't need to set this here, all the processing happens in SessionList.
     private volatile PeerLoadInfo afeLoad = PeerLoadInfo.getDefaultInstance();
 
     public AfeChannelGroup(AfeId afeId) {

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

@@ -53,20 +53,21 @@ public void updateConfig(SessionClientConfiguration.SessionPoolConfiguration con
   }
 
   private Picker createPicker(LoadBalancingOptions options) {
-    switch (options.getLoadBalancingStrategyCase()) {
-      case RANDOM:
-        return new SimplePicker(sessions, options.getRandom());
-      case LEAST_IN_FLIGHT:
-        return new LeastInFlightPicker(sessions, options.getLeastInFlight());
-      case PEAK_EWMA:
-        return new LeastLatencyPicker(sessions, options.getPeakEwma());
-      default:
-        LOGGER.log(
-            Level.FINE,
-            "got load balancing strategy {0} which was not implemented",
-            options.getLoadBalancingStrategyCase());
-        return new LeastInFlightPicker(
-            sessions, LoadBalancingOptions.LeastInFlight.getDefaultInstance());
-    }
+    return new WeightedLeastInFlightPicker(sessions);
+    // switch (options.getLoadBalancingStrategyCase()) {
+    //   case RANDOM:
+    //     return new SimplePicker(sessions, options.getRandom());
+    //   case LEAST_IN_FLIGHT:
+    //     return new LeastInFlightPicker(sessions, options.getLeastInFlight());
+    //   case PEAK_EWMA:
+    //     return new LeastLatencyPicker(sessions, options.getPeakEwma());
+    //   default:
+    //     LOGGER.log(
+    //         Level.FINE,
+    //         "got load balancing strategy {0} which was not implemented",
+    //         options.getLoadBalancingStrategyCase());
+    //     return new LeastInFlightPicker(
+    //         sessions, LoadBalancingOptions.LeastInFlight.getDefaultInstance());
+    // }
   }
 }

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

@@ -46,7 +46,7 @@ Optional<SessionHandle> pickSession() {
     List<AfeHandle> candidates = new ArrayList<>(readyAfes);
     int bestCost = Integer.MAX_VALUE;
     AfeHandle bestAfe = null;
-    long iterations = readyAfes.size();
+    long iterations = candidates.size();
     if (options.getRandomSubsetSize() > 0) {
       iterations = Math.min(options.getRandomSubsetSize(), iterations);
     }

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

@@ -71,7 +71,8 @@ public int getScaleDelta() {
     // support for multiplexing.
     int effectivePending = (int) Math.ceil((float) pendingRpcs.getSize() / pendingVRpcsPerSession);
     int sessionsInUse = effectivePending + stats.getInUseCount();
-    int unboundedDesiredIdleSessions = (int) Math.ceil(sessionsInUse * idlesSessionHeadRoom);
+    // TODO: double-check this logic.
+    int unboundedDesiredIdleSessions = (int) Math.ceil(sessionsInUse * idlesSessionHeadRoom / stats.getUsableFraction());
     int desiredIdleSessions =
         Math.max(Math.min(unboundedDesiredIdleSessions, maxIdleSessions), minIdleSessions);