From: Kamoltat <ksirivad@redhat.com>
Date: Mon, 25 Sep 2023 21:29:35 +0000 (+0000)
Subject: qa/tasks/ceph_manager.py: init test_min_size_duration
X-Git-Tag: v18.2.5~429^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=02e08e318cb9b92104071dac3ed0bedca339bcb3;p=ceph.git

qa/tasks/ceph_manager.py: init test_min_size_duration

Added comment about test_min_size_duration
in qa/tasks/thrashosds.

But also use the variable in ceph_manager.py

Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit 9f19dffc93463513e03908f3506c62e65364c0cd)
---

diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py
index e24965026c4..f1b5d08d3f9 100644
--- a/qa/tasks/ceph_manager.py
+++ b/qa/tasks/ceph_manager.py
@@ -895,7 +895,8 @@ class OSDThrasher(Thrasher):
         self.ceph_manager.wait_for_clean(timeout=180)
         assert self.ceph_manager.is_clean(), \
             'not clean before minsize thrashing starts'
-        while not self.stopping:
+        start = time.time()
+        while time.time() - start < self.config.get("test_min_size_duration", 1800):
             # look up k and m from all the pools on each loop, in case it
             # changes as the cluster runs
             k = 0
diff --git a/qa/tasks/thrashosds.py b/qa/tasks/thrashosds.py
index aa7ec437a60..476e0e4755a 100644
--- a/qa/tasks/thrashosds.py
+++ b/qa/tasks/thrashosds.py
@@ -63,6 +63,9 @@ def task(ctx, config):
        - kills that osd
        - revives all other osds
        - verifies that the osds fully recover
+    
+    test_min_size_duration: (1800) the number of seconds for
+        test_pool_min_size to last.
 
     timeout: (360) the number of seconds to wait for the cluster
        to become clean after each cluster change. If this doesn't