Implemented locality weighted load balancing (fixed tests)

allegro · Jan 15, 2024 · 20ea5df · 20ea5df
1 parent fa809be
commit 20ea5df
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/...llegro/tech/servicemesh/envoycontrol/snapshot/resource/endpoints/EnvoyEndpointsFactory.kt b/...llegro/tech/servicemesh/envoycontrol/snapshot/resource/endpoints/EnvoyEndpointsFactory.kt
@@ -96,7 +96,7 @@ class EnvoyEndpointsFactory(
             }
         val remaining = egressRouteSpecifications.filterIsInstance<StandardRouteSpecification>()
             .mapNotNull { clusterLoadAssignments[it.clusterName] }
-        return (remaining + weighted).filter { it.endpointsList.isNotEmpty() }
+        return (remaining + weighted)
     }
 
     private fun assignWeights(

diff --git a/...sts/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/routing/RoutingPolicyTest.kt b/...sts/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/routing/RoutingPolicyTest.kt
@@ -1,7 +1,6 @@
 package pl.allegro.tech.servicemesh.envoycontrol.routing
 
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.RegisterExtension
 import pl.allegro.tech.servicemesh.envoycontrol.assertions.isFrom
@@ -129,7 +128,6 @@ class RoutingPolicyTest {
     }
 
     @Test
-    @Disabled
     fun `should change routing when instance with prefered tag appears`() {
         // given
         val otherEchoId = consul.server.operations.registerService(
@@ -200,8 +198,7 @@ class RoutingPolicyTest {
         }
     }
 
-    @Test
-    @Disabled
+    @Test // todo remove logs
     fun `should change routing when instance with prefered tag disappers`() {
         // given
         val ipsumId = consul.server.operations.registerService(