qontract-reconcile 0.10.2.dev173__py3-none-any.whl → 0.10.2.dev175__py3-none-any.whl

{qontract_reconcile-0.10.2.dev173.dist-info → qontract_reconcile-0.10.2.dev175.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev173
+Version: 0.10.2.dev175
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev173.dist-info → qontract_reconcile-0.10.2.dev175.dist-info}/RECORD

@@ -123,7 +123,7 @@ reconcile/vpc_peerings_validator.py,sha256=aESqrhm1tpkc2iqSL1UV5to_HjNgjRSffD0cr
 reconcile/aus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aus/advanced_upgrade_service.py,sha256=lt684trHbKvVDLwwuNVz3Wu_MnytFSbS_7MZTIITh9k,23969
 reconcile/aus/aus_label_source.py,sha256=o0S2f0qwcII_8nzhHZhRQ83gEZ1DrSXyO4xzSwLebuU,4382
-reconcile/aus/base.py,sha256=K-CLPUDpaFSfFsf_UgcvaUPCgqTLTGkx_aoUH0VWhv8,50431
+reconcile/aus/base.py,sha256=rx2OuShoFRP7O6Kov9rRjEkhCPpPavfDF81tieB6XFg,50747
 reconcile/aus/cluster_version_data.py,sha256=VZWbUEIbrDKO-sroMpQtiWCTqDraTMd8tssKV0HyTQ0,7140
 reconcile/aus/healthchecks.py,sha256=jR9c-syh9impnkV0fd6XW3Bnk7iRN5zv8oCRYM-yIRY,2700
 reconcile/aus/metrics.py,sha256=nKT4m2zGT-QOMR0c-z-npVNKWsNMubzdffpU_f9n4II,3927
@@ -593,7 +593,7 @@ reconcile/unleash_feature_toggles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 reconcile/unleash_feature_toggles/integration.py,sha256=nx7BhtzCsTfPbOp60vI5MkNwuj8QrPay52msjADLbfI,10995
 reconcile/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/aggregated_list.py,sha256=_9UeaS1TWbJsGIESvXlzzK-omPI2lMMcCsoqc9LBclc,4022
-reconcile/utils/amtool.py,sha256=3dHViQ_esKPaMEpiOVVSnxTaySM8ELpGVVvppqqPvUY,2289
+reconcile/utils/amtool.py,sha256=Ng5VVNCiPYEK67eDjIwfuuTLs5JsfltCwt6w5UfXbcY,2289
 reconcile/utils/aws_api.py,sha256=1sQgbDqRBLQuwJ6dfmbl6L_6LsgMrIm6G7Cn7s61Q5Q,80375
 reconcile/utils/aws_helper.py,sha256=8PvDR17ntAGX3bBzlTIxDuENl2rkK-RECsNYKm2_DZw,2955
 reconcile/utils/batches.py,sha256=TtEm64a8lWhFuNbUVpFEmXVdU2Q0sTBrP_I0Cjbgh7g,320
@@ -807,7 +807,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev173.dist-info/METADATA,sha256=FvNTPyg42RM_QQGG_jcF9gdrkgv1nVHkoGb1SuFL6nE,24627
-qontract_reconcile-0.10.2.dev173.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev173.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev173.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev175.dist-info/METADATA,sha256=UCbZxjmW8UpEZhxqFSoasTNEH2w_UT9s0PtMCZj4kfU,24627
+qontract_reconcile-0.10.2.dev175.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev175.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev175.dist-info/RECORD,,

reconcile/aus/base.py

@@ -970,56 +970,53 @@ def verify_schedule_should_skip(
     return next_schedule.strftime("%Y-%m-%dT%H:%M:%SZ")
 
 
-def verify_lock_should_skip(
-    desired: ClusterUpgradeSpec, locked: dict[str, str]
-) -> bool:
-    mutexes = desired.effective_mutexes
-    if any(lock in locked for lock in mutexes):
-        locking = {lock: locked[lock] for lock in mutexes if lock in locked}
-        logging.debug(
-            f"[{desired.org.org_id}/{desired.org.name}/{desired.cluster.name}] skipping cluster: locked out by {locking}"
-        )
-        return True
-    return False
-
-
 def verify_max_upgrades_should_skip(
     desired: ClusterUpgradeSpec,
-    sector_upgrades: dict[str, set[str]],
+    locked: dict[str, str],
+    sector_mutex_upgrades: dict[tuple[str, str], set[str]],
     sector: Sector | None,
 ) -> bool:
-    if sector is None:
-        return False
+    mutexes = desired.effective_mutexes
 
-    current_upgrades = sector_upgrades[sector.name]
-    # Allow at least one upgrade
-    if len(current_upgrades) == 0:
+    # if sector.max_parallel_upgrades is not set, we allow 1 upgrade per mutex, across the whole org
+    if sector is None or sector.max_parallel_upgrades is None:
+        if any(lock in locked for lock in mutexes):
+            locking = {lock: locked[lock] for lock in mutexes if lock in locked}
+            logging.debug(
+                f"[{desired.org.org_id}/{desired.org.name}/{desired.cluster.name}] skipping cluster: locked out by {locking}"
+            )
+            return True
         return False
 
-    # if sector.max_parallel_upgrades is not set, we allow all upgrades
-    if sector.max_parallel_upgrades is None:
-        return False
+    current_upgrades_count_per_mutex = {
+        mutex: len(sector_mutex_upgrades[sector.name, mutex]) for mutex in mutexes
+    }
 
-    sector_cluster_count = len(sector.specs)
+    current_upgrades_total_count = sum(current_upgrades_count_per_mutex.values())
+    if current_upgrades_total_count == 0:
+        return False
 
-    if sector.max_parallel_upgrades.endswith("%"):
-        max_parallel_upgrades_percent = int(sector.max_parallel_upgrades[:-1])
-        max_parallel_upgrades = round(
-            sector_cluster_count * max_parallel_upgrades_percent / 100
-        )
-    else:
-        max_parallel_upgrades = int(sector.max_parallel_upgrades)
+    for mutex in mutexes:
+        cluster_count = len([s for s in sector.specs if mutex in s.effective_mutexes])
+        if sector.max_parallel_upgrades.endswith("%"):
+            max_parallel_upgrades_percent = int(sector.max_parallel_upgrades[:-1])
+            max_parallel_upgrades = round(
+                cluster_count * max_parallel_upgrades_percent / 100
+            )
+        else:
+            max_parallel_upgrades = int(sector.max_parallel_upgrades)
 
-    # we allow at least one upgrade
-    if max_parallel_upgrades == 0:
-        max_parallel_upgrades = 1
+        # we allow at least one upgrade
+        if max_parallel_upgrades == 0:
+            max_parallel_upgrades = 1
 
-    if len(current_upgrades) >= max_parallel_upgrades:
-        logging.debug(
-            f"[{desired.org.org_id}/{desired.org.name}/{desired.cluster.name}] skipping cluster: "
-            f"sector '{sector.name}' has reached max parallel upgrades {sector.max_parallel_upgrades}"
-        )
-        return True
+        if current_upgrades_count_per_mutex.get(mutex, 0) >= max_parallel_upgrades:
+            logging.debug(
+                f"[{desired.org.org_id}/{desired.org.name}/{desired.cluster.name}] skipping cluster: "
+                f"sector '{sector.name}' has reached max parallel upgrades {sector.max_parallel_upgrades} "
+                f"for mutex '{mutex}'"
+            )
+            return True
 
     return False
 
@@ -1085,15 +1082,15 @@ def calculate_diff(
     """
 
     locked: dict[str, str] = {}
-    sector_upgrades: dict[str, set[str]] = defaultdict(set)
+    sector_mutex_upgrades: dict[tuple[str, str], set[str]] = defaultdict(set)
 
     def set_upgrading(
-        cluster_id: str, mutexes: set[str] | None, sector_name: str | None
+        cluster_id: str, mutexes: set[str], sector_name: str | None
     ) -> None:
-        for mutex in mutexes or set():
+        for mutex in mutexes:
             locked[mutex] = cluster_id
-        if sector_name:
-            sector_upgrades[sector_name].add(cluster_id)
+            if sector_name:
+                sector_mutex_upgrades[sector_name, mutex].add(cluster_id)
 
     diffs: list[UpgradePolicyHandler] = []
 
@@ -1113,7 +1110,9 @@ def calculate_diff(
         # Upgrading node pools, only required for Hypershift clusters
         # do this in the same loop, to skip cluster on node pool upgrade
         if spec.cluster.is_rosa_hypershift():
-            if verify_lock_should_skip(spec, locked):
+            if verify_max_upgrades_should_skip(
+                spec, locked, sector_mutex_upgrades, sector
+            ):
                 continue
 
             node_pool_update = _calculate_node_pool_diffs(spec, now)
@@ -1135,10 +1134,7 @@ def calculate_diff(
         if not next_schedule:
             continue
 
-        if verify_lock_should_skip(spec, locked):
-            continue
-
-        if verify_max_upgrades_should_skip(spec, sector_upgrades, sector):
+        if verify_max_upgrades_should_skip(spec, locked, sector_mutex_upgrades, sector):
             continue
 
         version = upgradeable_version(spec, version_data, sector)

reconcile/utils/amtool.py

@@ -6,7 +6,7 @@ from subprocess import (
     run,
 )
 
-AMTOOL_VERSION = ["0.24.0"]
+AMTOOL_VERSION = ["0.28.1"]
 AMTOOL_VERSION_REGEX = r"^amtool,\sversion\s([\d]+\.[\d]+\.[\d]+).+$"