lb:Implement LeastRequestLB as a petiole policy and restore RR and WRR (

grpc#10584) * Change LeastRequest, Round Robin and WeightedRoundRobin into petiole policies
larry-safran · Oct 16, 2023 · 0d39bf5 · 0d39bf5
1 parent fc03f2b
commit 0d39bf5
Show file tree

Hide file tree

Showing 16 changed files with 1,532 additions and 1,029 deletions.
diff --git a/api/src/main/java/io/grpc/EquivalentAddressGroup.java b/api/src/main/java/io/grpc/EquivalentAddressGroup.java
@@ -128,6 +128,9 @@ public int hashCode() {
    */
   @Override
   public boolean equals(Object other) {
+    if (this == other) {
+      return true;
+    }
     if (!(other instanceof EquivalentAddressGroup)) {
       return false;
     }

diff --git a/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java b/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java
@@ -161,7 +161,7 @@
 /** Unit tests for {@link ManagedChannelImpl}. */
 @RunWith(JUnit4.class)
 // TODO(creamsoup) remove backward compatible check when fully migrated
-@SuppressWarnings("deprecation")
+@SuppressWarnings({"deprecation"})
 public class ManagedChannelImplTest {
   private static final int DEFAULT_PORT = 447;
 

diff --git a/core/src/testFixtures/java/io/grpc/internal/TestUtils.java b/core/src/testFixtures/java/io/grpc/internal/TestUtils.java
@@ -21,9 +21,11 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import io.grpc.Attributes;
 import io.grpc.CallOptions;
 import io.grpc.ChannelLogger;
 import io.grpc.ClientStreamTracer;
+import io.grpc.EquivalentAddressGroup;
 import io.grpc.InternalLogId;
 import io.grpc.LoadBalancer.PickResult;
 import io.grpc.LoadBalancer.PickSubchannelArgs;
@@ -143,6 +145,14 @@ public Runnable answer(InvocationOnMock invocation) throws Throwable {
     return captor;
   }
 
+  @SuppressWarnings("ReferenceEquality")
+  public static final EquivalentAddressGroup stripAttrs(EquivalentAddressGroup eag) {
+    if (eag.getAttributes() == Attributes.EMPTY) {
+      return eag;
+    }
+    return new EquivalentAddressGroup(eag.getAddresses());
+  }
+
   private TestUtils() {
   }
 

diff --git a/util/build.gradle b/util/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id "java-library"
+    id "java-test-fixtures"
     id "maven-publish"
 
     id "me.champeau.jmh"
@@ -19,11 +20,18 @@ dependencies {
 
     implementation libraries.animalsniffer.annotations,
             libraries.guava
-    testImplementation testFixtures(project(':grpc-api')),
+    testImplementation libraries.guava.testlib,
+            testFixtures(project(':grpc-api')),
             testFixtures(project(':grpc-core')),
             project(':grpc-testing')
-    testImplementation libraries.guava.testlib
 
+    testFixturesApi project(':grpc-core')
+    testFixturesImplementation libraries.guava,
+            libraries.junit,
+            libraries.mockito.core,
+            testFixtures(project(':grpc-api')),
+            testFixtures(project(':grpc-core')),
+            project(':grpc-testing')
     jmh project(':grpc-testing')
 
     signature libraries.signature.java