Implemented locality weighted load balancing (added locality log)

allegro · Jan 22, 2024 · c5a14d1 · c5a14d1
1 parent 017413d
commit c5a14d1
Showing 1 changed file with 8 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
@@ -167,7 +167,7 @@ class EnvoyEndpointsFactory(
             .setLocality(EnvoyProxyLocality.newBuilder().setZone(zone).build())
             .addAllLbEndpoints(serviceInstances?.instances
                 ?.map {
-                    createLbEndpoint(it, serviceInstances.serviceName, locality, priority)
+                    createLbEndpoint(it, serviceInstances.serviceName, locality, priority, zone)
                 } ?: emptyList())
             .setPriority(priority)
             .build()
@@ -177,13 +177,14 @@ class EnvoyEndpointsFactory(
         serviceInstance: ServiceInstance,
         serviceName: String,
         locality: Locality,
-        priority: Int
+        priority: Int,
+        zone: String
     ): LbEndpoint {
         return LbEndpoint.newBuilder()
             .setEndpoint(
                 buildEndpoint(serviceInstance)
             )
-            .setMetadata(serviceInstance, serviceName, locality, priority)
+            .setMetadata(serviceInstance, serviceName, locality, priority, zone)
             .setLoadBalancingWeightFromInstance(serviceInstance)
             .build()
     }
@@ -213,7 +214,8 @@ class EnvoyEndpointsFactory(
         instance: ServiceInstance,
         serviceName: String,
         locality: Locality,
-        priority: Int
+        priority: Int,
+        zone: String
     ): LbEndpoint.Builder {
         val lbMetadataKeys = Struct.newBuilder()
         val socketMatchMetadataKeys = Struct.newBuilder()
@@ -246,7 +248,8 @@ class EnvoyEndpointsFactory(
             logger.info(
                 "Resolved metadata locality to $calcLocality with " +
                     "currentZone=$currentZone, locality: $locality priority $priority " +
-                    "props=${properties.loadBalancing.priorities.zonePriorities}, serviceName: $serviceName"
+                    ", serviceName: $serviceName, zone: $zone" +
+                    "props=${properties.loadBalancing.priorities.zonePriorities}"
             )
         }
         lbMetadataKeys.putFields(