service-capacity-modeling 0.3.56__py3-none-any.whl → 0.3.58__py3-none-any.whl

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/tools/generate_missing.py

@@ -40,7 +40,7 @@ def build_command(family: str, params: Dict[str, Any], output_path: Path) -> lis
     return cmd
 
 
-def main(debug: bool = True, execute: bool = False):
+def main(debug: bool = True, execute: bool = False, force: bool = False):
     expected_path = (
         Path(__file__).resolve().parent.parent / "hardware/profiles/shapes/aws"
     )
@@ -51,7 +51,7 @@ def main(debug: bool = True, execute: bool = False):
     missing_families = {
         family: params
         for family, params in INSTANCE_TYPES.items()
-        if not (expected_path / f"auto_{family}.json").exists()
+        if force or not (expected_path / f"auto_{family}.json").exists()
     }
 
     if not missing_families:
@@ -87,5 +87,6 @@ if __name__ == "__main__":
     # Parse arguments to determine whether to execute commands
     execute_mode = "--execute" in sys.argv
     debug_mode = "--debug" in sys.argv or not execute_mode
+    force_mode = "--force" in sys.argv
 
-    main(debug=debug_mode, execute=execute_mode)
+    main(debug=debug_mode, execute=execute_mode, force=force_mode)

{service_capacity_modeling-0.3.56.dist-info → service_capacity_modeling-0.3.58.dist-info}/METADATA

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

{service_capacity_modeling-0.3.56.dist-info → service_capacity_modeling-0.3.58.dist-info}/RECORD

@@ -46,7 +46,7 @@ service_capacity_modeling/models/utils.py,sha256=0F__wz9KAGhPIQfvNp-FTtTANW6-sO4
 service_capacity_modeling/models/org/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 service_capacity_modeling/models/org/netflix/__init__.py,sha256=m7IaQbo85NEbDvfoPJREIznpzg0YHTCrKP5C1GvnOYM,2378
 service_capacity_modeling/models/org/netflix/aurora.py,sha256=Mi9zd48k64GkKIjAs3J1S2qThguNvyWIy2dUmhwrVhc,12883
-service_capacity_modeling/models/org/netflix/cassandra.py,sha256=mglxXmEFF_ge8_HD02mHuFp4leLEA4JF3xDAS1h7bW4,32896
+service_capacity_modeling/models/org/netflix/cassandra.py,sha256=47R0jgdyL1kxekJ-2UvW-GC018qYG-iU_c8SZzcHQZk,33443
 service_capacity_modeling/models/org/netflix/counter.py,sha256=hOVRRCgCPU-A5TdLKQXc_mWTQpkKOWRNjOeECdDP7kA,9205
 service_capacity_modeling/models/org/netflix/crdb.py,sha256=2rD4Io0yT7o0NR4lNferXXOSTDe0SkT1LbSChvNgRrQ,19698
 service_capacity_modeling/models/org/netflix/ddb.py,sha256=2jxMFz31xckJvymvVlu1yWm0X4dGYlqxDo0bftU1B9M,26307
@@ -67,11 +67,11 @@ service_capacity_modeling/models/org/netflix/zookeeper.py,sha256=buYv400R8_KCF4Y
 service_capacity_modeling/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 service_capacity_modeling/tools/auto_shape.py,sha256=Rk5Fjrw2susVL8It_J2KUADoMGBN6N394fcThdl62Ng,14672
 service_capacity_modeling/tools/fetch_pricing.py,sha256=SHOtFaPr61op2bnY9i_g_1-d-Nz2rV8c7Jwsye2R49s,3763
-service_capacity_modeling/tools/generate_missing.py,sha256=WN7Y0iPjelJu9d2Yq5dcu_EBIQPX2VxKgOou4NMNOM4,2860
+service_capacity_modeling/tools/generate_missing.py,sha256=uvr9fQanx3bm4KTneH-x7EOQvO7cVV0i9gdQvArPCuY,2947
 service_capacity_modeling/tools/instance_families.py,sha256=e9JWSIdljSmHI8Nb2MI5Ld9JqQ7WdOtPtV7g3oR7ZiU,7764
-service_capacity_modeling-0.3.56.dist-info/licenses/LICENSE,sha256=nl_Lt5v9VvJ-5lWJDT4ddKAG-VZ-2IaLmbzpgYDz2hU,11343
-service_capacity_modeling-0.3.56.dist-info/METADATA,sha256=5AqRh2xiWGZihb6rzg_KzuICQgA7Gd_Xd5Q15f0SW38,9590
-service_capacity_modeling-0.3.56.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-service_capacity_modeling-0.3.56.dist-info/entry_points.txt,sha256=ZsjzpG5SomWpT1zCE19n1uSXKH2gTI_yc33sdl0vmJg,146
-service_capacity_modeling-0.3.56.dist-info/top_level.txt,sha256=H8XjTCLgR3enHq5t3bIbxt9SeUkUT8HT_SDv2dgIT_A,26
-service_capacity_modeling-0.3.56.dist-info/RECORD,,
+service_capacity_modeling-0.3.58.dist-info/licenses/LICENSE,sha256=nl_Lt5v9VvJ-5lWJDT4ddKAG-VZ-2IaLmbzpgYDz2hU,11343
+service_capacity_modeling-0.3.58.dist-info/METADATA,sha256=I7I4UO18FYRZ-LP5hGDhVFP_4w_zQrEKKh-WphQroKE,9590
+service_capacity_modeling-0.3.58.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+service_capacity_modeling-0.3.58.dist-info/entry_points.txt,sha256=ZsjzpG5SomWpT1zCE19n1uSXKH2gTI_yc33sdl0vmJg,146
+service_capacity_modeling-0.3.58.dist-info/top_level.txt,sha256=H8XjTCLgR3enHq5t3bIbxt9SeUkUT8HT_SDv2dgIT_A,26
+service_capacity_modeling-0.3.58.dist-info/RECORD,,