qa/suites/nvmeof/thrash: Add "is unavailable" to log-ignorelist

This commit also:
- Remove --rbd_iostat from thrasher fio
- Log iteration details before printing stats in nvmeof_tharsher

Signed-off-by: Vallari Agrawal <vallari.agrawal@ibm.com>

diff --git a/qa/suites/nvmeof/thrash/thrashers/nvmeof_mon_thrash.yaml b/qa/suites/nvmeof/thrash/thrashers/nvmeof_mon_thrash.yaml
index 19fa2ec605dbd215cfbed91491fc790e71d42053..46037784d313bf6886c00f275ef303c5a2e88db9 100644 (file)
--- a/qa/suites/nvmeof/thrash/thrashers/nvmeof_mon_thrash.yaml
+++ b/qa/suites/nvmeof/thrash/thrashers/nvmeof_mon_thrash.yaml
@@ -11,6 +11,7 @@ overrides:
       - NVMEOF_SINGLE_GATEWAY
       - NVMEOF_GATEWAY_DOWN
       - are in unavailable state
+      - is unavailable
       - is in error state
       - failed cephadm daemon
 

diff --git a/qa/suites/nvmeof/thrash/thrashers/nvmeof_thrash.yaml b/qa/suites/nvmeof/thrash/thrashers/nvmeof_thrash.yaml
index 80bf052771598c91d97241a6dc1371de783cbc55..8949e163401fb11bf38c0ec37ada23aea1f1d773 100644 (file)
--- a/qa/suites/nvmeof/thrash/thrashers/nvmeof_thrash.yaml
+++ b/qa/suites/nvmeof/thrash/thrashers/nvmeof_thrash.yaml
@@ -6,6 +6,7 @@ overrides:
       - NVMEOF_SINGLE_GATEWAY
       - NVMEOF_GATEWAY_DOWN
       - are in unavailable state
+      - is unavailable
       - is in error state
       - failed cephadm daemon
 

diff --git a/qa/suites/nvmeof/thrash/workloads/fio.yaml b/qa/suites/nvmeof/thrash/workloads/fio.yaml
index 80336b8d596b6424fee26de053430257dcfdfc16..e5f130ebe2666280dbfe11cf82dcb99c0ef86c44 100644 (file)
--- a/qa/suites/nvmeof/thrash/workloads/fio.yaml
+++ b/qa/suites/nvmeof/thrash/workloads/fio.yaml
@@ -4,7 +4,7 @@ tasks:
     timeout: 30m
     clients:
       client.0:
-        - nvmeof/fio_test.sh --rbd_iostat
+        - nvmeof/fio_test.sh
     env:
       RBD_POOL: mypool
       IOSTAT_INTERVAL: '10'

diff --git a/qa/tasks/nvmeof.py b/qa/tasks/nvmeof.py
index dfa558b91fa08483a951134119694738b744fd81..5defc710fed39ad07e81cc00a8df49d84ae795a3 100644 (file)
--- a/qa/tasks/nvmeof.py
+++ b/qa/tasks/nvmeof.py
@@ -469,7 +469,7 @@ class NvmeofThrasher(Thrasher, Greenlet):
 
                 self.log(f'waiting for {revive_delay} secs before reviving')
                 time.sleep(revive_delay) # blocking wait
-                self.log('done waiting before reviving')
+                self.log(f'done waiting before reviving - iteration #{len(summary)}: {iteration_summary}')
 
                 self.do_checks()
                 self.switch_task()
@@ -488,7 +488,7 @@ class NvmeofThrasher(Thrasher, Greenlet):
                 if thrash_delay > 0.0:
                     self.log(f'waiting for {thrash_delay} secs before thrashing')
                     time.sleep(thrash_delay) # blocking
-                    self.log('done waiting before thrashing')
+                    self.log('done waiting before thrashing - everything should be up now')
 
                 self.do_checks()
                 self.switch_task()