required cluster type parameter is now per zone

Netflix-Skunkworks · Oct 16, 2023 · 82dd4c5 · 82dd4c5
1 parent 0ce2064
commit 82dd4c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/service_capacity_modeling/models/org/netflix/cassandra.py b/service_capacity_modeling/models/org/netflix/cassandra.py
@@ -81,7 +81,7 @@ def _estimate_cassandra_requirement(
     """
     # Keep half of the cores free for background work (compaction, backup, repair)
     if max_cpu_utilization is not None and current_instance is not None and required_cluster_size is not None:
-        needed_cores = (current_instance.cpu * required_cluster_size) * (max_cpu_utilization / 20)
+        needed_cores = (current_instance.cpu * required_cluster_size * zones_per_region) * (max_cpu_utilization / 20)
     else:
         needed_cores = sqrt_staffed_cores(desires) * 2
     # Keep half of the bandwidth available for backup

diff --git a/tests/netflix/test_cassandra.py b/tests/netflix/test_cassandra.py
@@ -339,11 +339,11 @@ def test_plan_certain():
         num_regions=4,
         desires=worn_desire,
         extra_model_arguments={
-            "required_cluster_size": 24,
+            "required_cluster_size": 8,
             "max_cpu_utilization": 14.194801291058118,
         },
     )
 
     lr_clusters = cap_plan[0].candidate_clusters.zonal[0]
-    assert lr_clusters.count == 24
-    assert lr_clusters.instance.cpu == 8
+    assert lr_clusters.count == 8
+    assert lr_clusters.instance.cpu == 16