service-capacity-modeling 0.3.48__tar.gz → 0.3.51__tar.gz

{service_capacity_modeling-0.3.48 → service_capacity_modeling-0.3.51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: service-capacity-modeling
-Version: 0.3.48
+Version: 0.3.51
 Summary: Contains utilities for modeling capacity for pluggable workloads
 Author: Joseph Lynch
 Author-email: josephl@netflix.com

{service_capacity_modeling-0.3.48 → service_capacity_modeling-0.3.51}/service_capacity_modeling/models/common.py

@@ -374,6 +374,9 @@ def compute_stateful_zone(  # pylint: disable=too-many-positional-arguments
     min_count: int = 0,
     adjusted_disk_io_needed: float = 0.0,
     read_write_ratio: float = 0.0,
+    # Max attached EBS volume size per node. Higher value here could allow
+    # for a lower instance count (allows more vertical scaling vs forcing horizontal)
+    max_attached_disk_gib: Optional[float] = None,
 ) -> ZoneClusterCapacity:
     # Datastores often require disk headroom for e.g. compaction and such
     if instance.drive is not None:
@@ -461,6 +464,9 @@ def compute_stateful_zone(  # pylint: disable=too-many-positional-arguments
         # 1/3 the maximum volume size in one node (preferring more nodes
         # with smaller volumes)
         max_size = drive.max_size_gib / 3
+        if max_attached_disk_gib is not None:
+            max_size = max_attached_disk_gib
+
         if ebs_gib > max_size > 0:
             ratio = ebs_gib / max_size
             count = max(cluster_size(math.ceil(count * ratio)), min_count)
@@ -745,7 +751,10 @@ def get_memory_from_current_capacity(
     current_capacity: CurrentClusterCapacity, buffers: Buffers
 ):
     # compute memory required per zone
-    current_memory_utilization = current_capacity.memory_utilization_gib.mid
+    current_memory_utilization = (
+        current_capacity.memory_utilization_gib.mid
+        * current_capacity.cluster_instance_count.mid
+    )
 
     if current_capacity.cluster_instance is None:
         cluster_instance = shapes.instance(current_capacity.cluster_instance_name)
@@ -784,7 +793,10 @@ def get_network_from_current_capacity(
     current_capacity: CurrentClusterCapacity, buffers: Buffers
 ):
     # compute network required per zone
-    current_network_utilization = current_capacity.network_utilization_mbps.mid
+    current_network_utilization = (
+        current_capacity.network_utilization_mbps.mid
+        * current_capacity.cluster_instance_count.mid
+    )
 
     if current_capacity.cluster_instance is None:
         cluster_instance = shapes.instance(current_capacity.cluster_instance_name)
@@ -823,7 +835,10 @@ def get_disk_from_current_capacity(
     current_capacity: CurrentClusterCapacity, buffers: Buffers
 ):
     # compute disk required per zone
-    current_disk_utilization = current_capacity.disk_utilization_gib.mid
+    current_disk_utilization = (
+        current_capacity.disk_utilization_gib.mid
+        * current_capacity.cluster_instance_count.mid
+    )
 
     if current_capacity.cluster_instance is None:
         cluster_instance = shapes.instance(current_capacity.cluster_instance_name)

{service_capacity_modeling-0.3.48 → service_capacity_modeling-0.3.51}/service_capacity_modeling/models/org/netflix/evcache.py

@@ -226,9 +226,6 @@ def _estimate_evcache_cluster_zonal(  # noqa: C901,E501 pylint: disable=too-many
     if instance.ram_gib < min_instance_memory_gib:
         return None
 
-    if instance.drive is None:
-        return None
-
     # Based on the disk latency and the read latency SLOs we adjust our
     # working set to keep more or less data in RAM. Faster drives need
     # less fronting RAM.

{service_capacity_modeling-0.3.48 → service_capacity_modeling-0.3.51}/service_capacity_modeling/models/org/netflix/kafka.py

@@ -337,6 +337,8 @@ def _estimate_kafka_cluster_zonal(  # pylint: disable=too-many-positional-argume
         # Sidecars and Variable OS Memory
         # Kafka currently uses 8GiB fixed, might want to change to min(30, x // 2)
         reserve_memory=lambda instance_mem_gib: base_mem + 8,
+        # allow up to 8TiB of attached EBS
+        max_attached_disk_gib=8 * 1024,
     )
 
     # Communicate to the actual provision that if we want reduced RF

{service_capacity_modeling-0.3.48 → service_capacity_modeling-0.3.51}/service_capacity_modeling.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: service-capacity-modeling
-Version: 0.3.48
+Version: 0.3.51
 Summary: Contains utilities for modeling capacity for pluggable workloads
 Author: Joseph Lynch
 Author-email: josephl@netflix.com

{service_capacity_modeling-0.3.48 → service_capacity_modeling-0.3.51}/tests/test_common.py

@@ -247,9 +247,9 @@ current_cluster = CurrentClusters(
             cpu_utilization=Interval(
                 low=10.12, mid=13.2, high=14.194801291058118, confidence=1
             ),
-            memory_utilization_gib=certain_float(32.0),
-            network_utilization_mbps=certain_float(128.0),
-            disk_utilization_gib=certain_float(159),
+            memory_utilization_gib=certain_float(4.0),
+            network_utilization_mbps=certain_float(32.0),
+            disk_utilization_gib=certain_float(20),
         )
     ]
 )
@@ -309,12 +309,12 @@ def test_get_cores_with_buffer_preserve():
 
 def test_get_disk_with_buffer_desired():
     needed_disk = get_disk_from_current_capacity(current_cluster.zonal[0], buffers)
-    assert needed_disk == 636
+    assert needed_disk == 640
 
 
 def test_get_disk_with_buffer_scale():
     current_cluster_copy = current_cluster.model_copy(deep=True)
-    current_cluster_copy.zonal[0].disk_utilization_gib = certain_float(1200)
+    current_cluster_copy.zonal[0].disk_utilization_gib = certain_float(150)
     buffers_copy = buffers.model_copy(deep=True)
     buffers_copy.derived = {
         "storage": Buffer(