Make Ceph Full treshold to be configurable

EPIC: https://issues.redhat.com/browse/RHSTOR-5929 Signed-off-by: Petr Balogh <[email protected]>
red-hat-storage · Jul 25, 2024 · b6c0ab0 · b6c0ab0
1 parent 1aeaace
commit b6c0ab0
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 4 deletions.
diff --git a/conf/README.md b/conf/README.md
@@ -325,6 +325,9 @@ higher priority).
 * `custom_vpc` - Applicable only for IMB Cloud IPI deployment where we want to create custom VPC and networking
   with specific Address prefixes to prevent /18 CIDR to be used.
 * `ip_prefix` - Applicable only for IMB Cloud IPI deployment when custom_vpc, if not specified: 27 prefix will be used.
+* `ceph_threshold_backfill_full_ratio` - Configure backfillFullRatio the ceph osd full thresholds value in the StorageCluster CR.
+* `ceph_threshold_full_ratio` - Configure fullRatio the ceph osd full thresholds value in the StorageCluster CR.
+* `ceph_threshold_near_full_ratio` - Configure nearFullRatio the ceph osd full thresholds value in the StorageCluster CR.
 
 #### UPGRADE
 

diff --git a/conf/ocsci/ceph_full_threshold.yaml b/conf/ocsci/ceph_full_threshold.yaml
@@ -0,0 +1,6 @@
+# For testing EPIC: https://issues.redhat.com/browse/RHSTOR-5929
+# Ceph full threshold is configurable via storageCluster
+ENV_DATA:
+  ceph_threshold_backfill_full_ratio: 0.925
+  ceph_threshold_full_ratio: 0.975
+  ceph_threshold_near_full_ratio: 0.875
diff --git a/ocs_ci/deployment/deployment.py b/ocs_ci/deployment/deployment.py
@@ -1564,13 +1564,41 @@ def deploy_ocs_via_operator(self, image=None):
         wait_timeout_for_healthy_osd_in_minutes = config.ENV_DATA.get(
             "wait_timeout_for_healthy_osd_in_minutes"
         )
-        if wait_timeout_for_healthy_osd_in_minutes:
+        # For testing: https://issues.redhat.com/browse/RHSTOR-5929
+        ceph_threshold_backfill_full_ratio = config.ENV_DATA.get(
+            "ceph_threshold_backfill_full_ratio"
+        )
+        ceph_threshold_full_ratio = config.ENV_DATA.get("ceph_threshold_full_ratio")
+        ceph_threshold_near_full_ratio = config.ENV_DATA.get(
+            "ceph_threshold_near_full_ratio"
+        )
+        set_managed_resources_ceph_cluster = (
+            wait_timeout_for_healthy_osd_in_minutes
+            or ceph_threshold_backfill_full_ratio
+            or ceph_threshold_full_ratio
+            or ceph_threshold_near_full_ratio
+        )
+        if set_managed_resources_ceph_cluster:
             cluster_data.setdefault("spec", {}).setdefault(
                 "managedResources", {}
             ).setdefault("cephCluster", {})
-            cluster_data["spec"]["managedResources"]["cephCluster"][
-                "waitTimeoutForHealthyOSDInMinutes"
-            ] = wait_timeout_for_healthy_osd_in_minutes
+            managed_resources_ceph_cluster = cluster_data["spec"]["managedResources"][
+                "cephCluster"
+            ]
+            if wait_timeout_for_healthy_osd_in_minutes:
+                managed_resources_ceph_cluster[
+                    "waitTimeoutForHealthyOSDInMinutes"
+                ] = wait_timeout_for_healthy_osd_in_minutes
+            if ceph_threshold_backfill_full_ratio:
+                managed_resources_ceph_cluster[
+                    "backfillFullRatio"
+                ] = ceph_threshold_backfill_full_ratio
+            if ceph_threshold_full_ratio:
+                managed_resources_ceph_cluster["fullRatio"] = ceph_threshold_full_ratio
+            if ceph_threshold_near_full_ratio:
+                managed_resources_ceph_cluster[
+                    "nearFullRatio"
+                ] = ceph_threshold_near_full_ratio
 
         cluster_data_yaml = tempfile.NamedTemporaryFile(
             mode="w+", prefix="cluster_storage", delete=False