qa/suites/nvmeof: Remove watchdog from thrasher

This commit does the following:
1. remove watchdog from thrasher
1. remove wait from fio_test
3. change thrasher switcher wait-time to 10 mins

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

diff --git a/qa/suites/nvmeof/thrash/base/install.yaml b/qa/suites/nvmeof/thrash/base/install.yaml
index 4b5cea952db1edddc56512bac428e44c7bb5df4e..88974f0e638041f2d56b4568abeebc7761a2741c 100644 (file)
--- a/qa/suites/nvmeof/thrash/base/install.yaml
+++ b/qa/suites/nvmeof/thrash/base/install.yaml
@@ -4,7 +4,6 @@ tasks:
     extra_packages:
         - nvme-cli
 - cephadm:
-    watchdog_setup:
 - cephadm.shell:
     host.a:
     # get state before nvmeof deployment

diff --git a/qa/tasks/nvmeof.py b/qa/tasks/nvmeof.py
index 1edafb1f41451ab1731cd91cd88b0d94341bea5c..b4afd604cb9167270d67b49e047033514991be82 100644 (file)
--- a/qa/tasks/nvmeof.py
+++ b/qa/tasks/nvmeof.py
@@ -404,7 +404,7 @@ class NvmeofThrasher(Thrasher, Greenlet):
             ):
                 other_thrasher = t
                 self.log('switch_task: waiting for other thrasher')
-                other_thrasher.switch_thrasher.wait(300)
+                other_thrasher.switch_thrasher.wait(600)
                 self.log('switch_task: done waiting for the other thrasher')
                 other_thrasher.switch_thrasher.clear()
 

diff --git a/qa/workunits/nvmeof/fio_test.sh b/qa/workunits/nvmeof/fio_test.sh
index 03dc369e589d91062cda699114ee6342d91ef6f8..7334dad3d53abb900b2fed8cd6ebdc8b8e257135 100755 (executable)
--- a/qa/workunits/nvmeof/fio_test.sh
+++ b/qa/workunits/nvmeof/fio_test.sh
@@ -80,6 +80,5 @@ if [ "$rbd_iostat" = true  ]; then
 fi
 fio --showcmd $fio_file
 sudo fio $fio_file 
-wait
 
 echo "[nvmeof.fio] fio test successful!"