add purr scheduler

yanet-platform · Jan 31, 2025 · dee819a · dee819a
1 parent b43c31a
commit dee819a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/autotest/units/001_one_port/080_balancer_pure_round_robin/services.conf b/autotest/units/001_one_port/080_balancer_pure_round_robin/services.conf
@@ -3,38 +3,42 @@
     "vip": "10.0.0.3",
     "proto": "udp",
     "vport": "80",
-    "scheduler": "rr",
-    "pure_round_robin": true,
+    "scheduler": "purr",
     "ops": true,
     "reals": [
       {
         "ip": "2000::1",
-        "port": "80"
+        "port": "80",
+        "weight": "1"
       },
       {
         "ip": "2000::2",
-        "port": "80"
+        "port": "80",
+        "weight": "1"
       },
       {
         "ip": "2000::3",
-        "port": "80"
+        "port": "80",
+        "weight": "1"
       }
     ]
   },
   {
     "vip": "10.0.0.3",
     "proto": "udp",
     "vport": "81",
-    "scheduler": "rr",
+    "scheduler": "wrr",
     "ops": true,
     "reals": [
       {
         "ip": "2000::1",
-        "port": "81"
+        "port": "81",
+        "weight": "1"
       },
       {
         "ip": "2000::2",
-        "port": "81"
+        "port": "81",
+        "weight": "1"
       }
     ]
   }

diff --git a/controlplane/configparser.cpp b/controlplane/configparser.cpp
@@ -1651,6 +1651,7 @@ void config_parser_t::loadConfig_balancer_services(controlplane::base_t& baseNex
 
 		balancer::scheduler scheduler{};
 		balancer::scheduler_params scheduler_params{};
+        uint8_t flags = 0;
 		if (scheduler_string == "rr")
 		{
 			scheduler = balancer::scheduler::rr;
@@ -1667,7 +1668,12 @@ void config_parser_t::loadConfig_balancer_services(controlplane::base_t& baseNex
 				scheduler_params.wlc_power = std::stoll(service_json["scheduler_params"]["wlc_power"].get<std::string>(), nullptr, 10);
 			}
 		}
-		else
+		else if(scheduler_string == "purr")
+        {
+            scheduler = balancer::scheduler::wrr;
+            flags |= YANET_BALANCER_PURE_ROUND_ROBIN;
+        }
+        else
 		{
 			throw error_result_t(eResult::invalidConfigurationFile, "unknown scheduler: " + scheduler_string);
 		}
@@ -1725,7 +1731,6 @@ void config_parser_t::loadConfig_balancer_services(controlplane::base_t& baseNex
 			throw error_result_t(eResult::invalidConfigurationFile, "unknown proto");
 		}
 
-		uint8_t flags = 0;
 		if (service_json.value("mss_fix", false) == true)
 		{
 			flags |= YANET_BALANCER_FIX_MSS_FLAG;
@@ -1743,11 +1748,6 @@ void config_parser_t::loadConfig_balancer_services(controlplane::base_t& baseNex
 			flags |= YANET_BALANCER_OPS_FLAG;
 		}
 
-		if (service_json.value("pure_round_robin", false))
-		{
-			flags |= YANET_BALANCER_PURE_ROUND_ROBIN;
-		}
-
 		balancer.services.emplace_back(baseNext.services_count + 1, ///< 0 is invalid id
 		                               service_json["vip"].get<std::string>(),
 		                               proto,