From 76b40284a6bf91f84cabf00cd36230c8d2340d88 Mon Sep 17 00:00:00 2001 From: Vallari Agrawal Date: Thu, 30 Jan 2025 17:43:48 +0530 Subject: [PATCH] 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 --- qa/suites/nvmeof/thrash/base/install.yaml | 1 - qa/tasks/nvmeof.py | 2 +- qa/workunits/nvmeof/fio_test.sh | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/qa/suites/nvmeof/thrash/base/install.yaml b/qa/suites/nvmeof/thrash/base/install.yaml index 4b5cea952db..88974f0e638 100644 --- 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 1edafb1f414..b4afd604cb9 100644 --- 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 03dc369e589..7334dad3d53 100755 --- 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!" -- 2.39.5