service-capacity-modeling 0.3.55__tar.gz → 0.3.57__tar.gz

{service_capacity_modeling-0.3.55 → service_capacity_modeling-0.3.57}/PKG-INFO

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

{service_capacity_modeling-0.3.55 → service_capacity_modeling-0.3.57}/service_capacity_modeling/models/org/netflix/cassandra.py

@@ -206,8 +206,34 @@ def _estimate_cassandra_requirement(  # pylint: disable=too-many-positional-argu
     )
     rps_working_set = min(1.0, disk_rps / max_rps_to_disk)
 
-    if memory_preserve:
-        needed_memory = capacity_requirement.mem_gib.mid
+    # Cassandra can defer writes either by buffering in memory or by
+    # waiting longer before recompacting (the min-threshold on the
+    # L0 compactions or STCS compactions)
+    min_threshold = 4
+    write_buffer_gib = _write_buffer_gib_zone(
+        desires=desires,
+        zones_per_region=zones_per_region,
+        flushes_before_compaction=min_threshold,
+    )
+
+    while write_buffer_gib > 12 and min_threshold < 16:
+        min_threshold *= 2
+        write_buffer_gib = _write_buffer_gib_zone(
+            desires=desires,
+            zones_per_region=zones_per_region,
+            flushes_before_compaction=min_threshold,
+        )
+
+    if current_capacity and current_capacity.cluster_instance and memory_preserve:
+        # remove base memory and heap from per node ram and then
+        # multiply by number of nodes in a zone to compute the zonal requirement.
+        reserve_memory = _get_base_memory(desires) + _cass_heap(
+            current_capacity.cluster_instance.ram_gib
+        )
+        needed_memory = (
+            current_capacity.cluster_instance.ram_gib - reserve_memory
+        ) * current_capacity.cluster_instance_count.mid
+        write_buffer_gib = 0
     else:
         # If disk RPS will be smaller than our target because there are no
         # reads, we don't need to hold as much data in memory.
@@ -227,24 +253,6 @@ def _estimate_cassandra_requirement(  # pylint: disable=too-many-positional-argu
         working_set,
     )
 
-    # Cassandra can defer writes either by buffering in memory or by
-    # waiting longer before recompacting (the min-threshold on the
-    # L0 compactions or STCS compactions)
-    min_threshold = 4
-    write_buffer_gib = _write_buffer_gib_zone(
-        desires=desires,
-        zones_per_region=zones_per_region,
-        flushes_before_compaction=min_threshold,
-    )
-
-    while write_buffer_gib > 12 and min_threshold < 16:
-        min_threshold *= 2
-        write_buffer_gib = _write_buffer_gib_zone(
-            desires=desires,
-            zones_per_region=zones_per_region,
-            flushes_before_compaction=min_threshold,
-        )
-
     return CapacityRequirement(
         requirement_type="cassandra-zonal",
         reference_shape=reference_shape,
@@ -358,10 +366,7 @@ def _estimate_cassandra_cluster_zonal(  # pylint: disable=too-many-positional-ar
     if desires.service_tier <= 1:
         min_count = 2
 
-    base_mem = (
-        desires.data_shape.reserved_instance_app_mem_gib
-        + desires.data_shape.reserved_instance_system_mem_gib
-    )
+    base_mem = _get_base_memory(desires)
 
     heap_fn = _cass_heap_for_write_buffer(
         instance=instance,
@@ -484,6 +489,13 @@ def _cass_io_per_read(node_size_gib, sstable_size_mb=160):
     return 2 * levels
 
 
+def _get_base_memory(desires: CapacityDesires):
+    return (
+        desires.data_shape.reserved_instance_app_mem_gib
+        + desires.data_shape.reserved_instance_system_mem_gib
+    )
+
+
 def _cass_heap_for_write_buffer(
     instance: Instance,
     write_buffer_gib: float,

{service_capacity_modeling-0.3.55 → service_capacity_modeling-0.3.57}/service_capacity_modeling/models/org/netflix/kafka.py

@@ -188,7 +188,8 @@ def _estimate_kafka_requirement(  # pylint: disable=too-many-positional-argument
     ) // zones_per_region
 
     logger.debug(
-        "Need (cpu, mem, disk) = (%s, %s, %s)",
+        "Need (instance, cpu, mem, disk) = (%s, %s, %s, %s)",
+        instance.name,
         needed_cores,
         needed_memory,
         needed_disk,
@@ -235,7 +236,7 @@ def _kafka_read_io(rps, io_size_kib, size_gib, recovery_seconds: int) -> float:
 # pylint: disable=too-many-locals
 # pylint: disable=too-many-return-statements
 # pylint: disable=too-many-positional-arguments
-def _estimate_kafka_cluster_zonal(
+def _estimate_kafka_cluster_zonal(  # noqa: C901
     instance: Instance,
     drive: Drive,
     desires: CapacityDesires,
@@ -360,11 +361,14 @@ def _estimate_kafka_cluster_zonal(
     if required_zone_size is not None:
         space_gib = max(1, math.ceil(requirement.disk_gib.mid / required_zone_size))
         ebs_gib = utils.next_n(space_gib, n=100)
-        max_size = (
-            max_attached_disk_gib
-            if max_attached_disk_gib is not None
-            else drive.max_size_gib / 3
-        )  # Max allowed disk in `compute_stateful_zone`
+
+        # Max allowed disk size in `compute_stateful_zone`
+        if instance.drive is not None and instance.drive.size_gib > 0:
+            max_size = min(max_local_disk_gib, instance.drive.size_gib)
+        elif max_attached_disk_gib is not None:
+            max_size = max_attached_disk_gib
+        else:
+            max_size = drive.max_size_gib / 3
 
         # Capacity planner only allows ~ 5TB disk (max_size) for gp3 drives
         # or max_attached_disk_gib if provided.

{service_capacity_modeling-0.3.55 → service_capacity_modeling-0.3.57}/service_capacity_modeling.egg-info/PKG-INFO

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