Merge pull request ceph#42234 from sseshasa/wip-fix-standalone-cleanups

qa/standalone: Add missing cleanups after completion of a subset of osd and scrub tests. Reviewed-by: Ronen Friedman <[email protected]> Reviewed-by: Neha Ojha <[email protected]>
mitsu-ko · Jul 9, 2021 · 3111ba8 · 3111ba8
2 parents 4b2d072 + 84cab65
commit 3111ba8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 70 deletions.
diff --git a/qa/standalone/osd/osd-force-create-pg.sh b/qa/standalone/osd/osd-force-create-pg.sh
@@ -12,14 +12,15 @@ function run() {
 
     local funcs=${@:-$(set | sed -n -e 's/^\(TEST_[0-9a-z_]*\) .*/\1/p')}
     for func in $funcs ; do
+        setup $dir || return 1
         $func $dir || return 1
+        teardown $dir || return 1
     done
 }
 
 function TEST_reuse_id() {
     local dir=$1
 
-    setup $dir || return 1
     run_mon $dir a --osd_pool_default_size=1 --mon_allow_pool_size_one=true || return 1
     run_mgr $dir x || return 1
     run_osd $dir 0 || return 1

diff --git a/qa/standalone/osd/osd-reuse-id.sh b/qa/standalone/osd/osd-reuse-id.sh
@@ -27,14 +27,15 @@ function run() {
 
     local funcs=${@:-$(set | sed -n -e 's/^\(TEST_[0-9a-z_]*\) .*/\1/p')}
     for func in $funcs ; do
+        setup $dir || return 1
         $func $dir || return 1
+        teardown $dir || return 1
     done
 }
 
 function TEST_reuse_id() {
     local dir=$1
 
-    setup $dir || return 1
     run_mon $dir a --osd_pool_default_size=1 --mon_allow_pool_size_one=true || return 1
     run_mgr $dir x || return 1
     run_osd $dir 0 || return 1

diff --git a/qa/standalone/osd/pg-split-merge.sh b/qa/standalone/osd/pg-split-merge.sh
@@ -12,14 +12,15 @@ function run() {
 
     local funcs=${@:-$(set | sed -n -e 's/^\(TEST_[0-9a-z_]*\) .*/\1/p')}
     for func in $funcs ; do
+        setup $dir || return 1
         $func $dir || return 1
+        teardown $dir || return 1
     done
 }
 
 function TEST_a_merge_empty() {
     local dir=$1
 
-    setup $dir || return 1
     run_mon $dir a --osd_pool_default_size=3 || return 1
     run_mgr $dir x || return 1
     run_osd $dir 0 || return 1
@@ -87,7 +88,6 @@ function TEST_a_merge_empty() {
 function TEST_import_after_merge_and_gap() {
     local dir=$1
 
-    setup $dir || return 1
     run_mon $dir a --osd_pool_default_size=1 --mon_allow_pool_size_one=true || return 1
     run_mgr $dir x || return 1
     run_osd $dir 0 || return 1
@@ -162,7 +162,6 @@ function TEST_import_after_merge_and_gap() {
 function TEST_import_after_split() {
     local dir=$1
 
-    setup $dir || return 1
     run_mon $dir a --osd_pool_default_size=1 --mon_allow_pool_size_one=true || return 1
     run_mgr $dir x || return 1
     run_osd $dir 0 || return 1