From: Sage Weil <sage@redhat.com>
Date: Mon, 6 Mar 2017 23:47:11 +0000 (-0500)
Subject: test/osd/osd-*.sh: run mgr daemon for tests
X-Git-Tag: v12.0.2~252^2~47
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e0a07e1ea921c6c5176d3d8ed0f3d257c284d650;p=ceph.git

test/osd/osd-*.sh: run mgr daemon for tests

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/erasure-code/test-erasure-code-plugins.sh b/src/test/erasure-code/test-erasure-code-plugins.sh
index 48c23195f318..ffba85b7f80e 100755
--- a/src/test/erasure-code/test-erasure-code-plugins.sh
+++ b/src/test/erasure-code/test-erasure-code-plugins.sh
@@ -43,6 +43,7 @@ function TEST_preload_warning() {
     for plugin in ${legacy_jerasure_plugins[*]} ${legacy_shec_plugins[*]}; do
         setup $dir || return 1
         run_mon $dir a --osd_erasure_code_plugins="${plugin}" || return 1 
+	run_mgr $dir x || return 1
         CEPH_ARGS='' ceph --admin-daemon $dir/ceph-mon.a.asok log flush || return 1
         run_osd $dir 0 --osd_erasure_code_plugins="${plugin}" || return 1 
         CEPH_ARGS='' ceph --admin-daemon $dir/ceph-osd.0.asok log flush || return 1
@@ -59,6 +60,7 @@ function TEST_preload_no_warning() {
     for plugin in ${plugins[*]}; do
         setup $dir || return 1
         run_mon $dir a --osd_erasure_code_plugins="${plugin}" || return 1 
+	run_mgr $dir x || return 1
         CEPH_ARGS='' ceph --admin-daemon $dir/ceph-mon.a.asok log flush || return 1
         run_osd $dir 0 --osd_erasure_code_plugins="${plugin}" || return 1 
         CEPH_ARGS='' ceph --admin-daemon $dir/ceph-osd.0.asok log flush || return 1
@@ -76,6 +78,7 @@ function TEST_preload_no_warning_default() {
     setup $dir || return 1
     run_mon $dir a || return 1 
     CEPH_ARGS='' ceph --admin-daemon $dir/ceph-mon.a.asok log flush || return 1
+    run_mgr $dir x || return 1
     run_osd $dir 0 || return 1 
     CEPH_ARGS='' ceph --admin-daemon $dir/ceph-osd.0.asok log flush || return 1
     ! grep "WARNING: osd_erasure_code_plugins" $dir/mon.a.log || return 1
@@ -90,6 +93,7 @@ function TEST_ec_profile_warning() {
 
     setup $dir || return 1
     run_mon $dir a || return 1 
+    run_mgr $dir x || return 1
     for id in $(seq 0 2) ; do
         run_osd $dir $id || return 1 
     done
diff --git a/src/test/erasure-code/test-erasure-code.sh b/src/test/erasure-code/test-erasure-code.sh
index cec40eca8152..b4417f664f6c 100755
--- a/src/test/erasure-code/test-erasure-code.sh
+++ b/src/test/erasure-code/test-erasure-code.sh
@@ -30,6 +30,7 @@ function run() {
 
     setup $dir || return 1
     run_mon $dir a || return 1
+    run_mgr $dir x || return 1
     # check that erasure code plugins are preloaded
     CEPH_ARGS='' ceph --admin-daemon $dir/ceph-mon.a.asok log flush || return 1
     grep 'load: jerasure.*lrc' $dir/mon.a.log || return 1
diff --git a/src/test/erasure-code/test-erasure-eio.sh b/src/test/erasure-code/test-erasure-eio.sh
index b78b420d3ec7..710b20343e98 100755
--- a/src/test/erasure-code/test-erasure-eio.sh
+++ b/src/test/erasure-code/test-erasure-eio.sh
@@ -32,6 +32,7 @@ function run() {
     for func in $funcs ; do
         setup $dir || return 1
         run_mon $dir a || return 1
+	run_mgr $dir x || return 1
         # check that erasure code plugins are preloaded
         CEPH_ARGS='' ceph --admin-daemon $dir/ceph-mon.a.asok log flush || return 1
         grep 'load: jerasure.*lrc' $dir/mon.a.log || return 1
diff --git a/src/test/osd/osd-bench.sh b/src/test/osd/osd-bench.sh
index f14a35152f7d..c44eb28e56a7 100755
--- a/src/test/osd/osd-bench.sh
+++ b/src/test/osd/osd-bench.sh
@@ -40,6 +40,7 @@ function TEST_bench() {
     local dir=$1
 
     run_mon $dir a || return 1
+    run_mgr $dir x || return 1
     run_osd $dir 0 || return 1
 
     local osd_bench_small_size_max_iops=$(CEPH_ARGS='' ceph-conf \
diff --git a/src/test/osd/osd-config.sh b/src/test/osd/osd-config.sh
index a27862c2235c..2a924042a137 100755
--- a/src/test/osd/osd-config.sh
+++ b/src/test/osd/osd-config.sh
@@ -40,6 +40,7 @@ function TEST_config_init() {
     local dir=$1
 
     run_mon $dir a || return 1
+    run_mgr $dir x || return 1
     local advance=1000
     local stale=1000
     local cache=500
@@ -57,6 +58,7 @@ function TEST_config_track() {
     local dir=$1
 
     run_mon $dir a || return 1
+    run_mgr $dir x || return 1
     run_osd $dir 0 || return 1
 
     local osd_map_cache_size=$(CEPH_ARGS='' ceph-conf \
diff --git a/src/test/osd/osd-copy-from.sh b/src/test/osd/osd-copy-from.sh
index 3f94743ddafc..ce7c04dfe4ce 100755
--- a/src/test/osd/osd-copy-from.sh
+++ b/src/test/osd/osd-copy-from.sh
@@ -41,6 +41,7 @@ function TEST_copy_from() {
     local dir=$1
 
     run_mon $dir a || return 1
+    run_mgr $dir x || return 1
     run_osd $dir 0 || return 1
     run_osd $dir 1 || return 1
 
diff --git a/src/test/osd/osd-fast-mark-down.sh b/src/test/osd/osd-fast-mark-down.sh
index e1bde8342107..5c8f420fecbb 100755
--- a/src/test/osd/osd-fast-mark-down.sh
+++ b/src/test/osd/osd-fast-mark-down.sh
@@ -53,6 +53,7 @@ function test_fast_kill() {
    # create cluster with 3 osds
    setup $dir || return 1
    run_mon $dir a --osd_pool_default_size=3 || return 1
+    run_mgr $dir x || return 1
    for oi in {0..2}; do
      run_osd $dir $oi || return 1
      pids[$oi]=$(cat $dir/osd.$oi.pid)
diff --git a/src/test/osd/osd-markdown.sh b/src/test/osd/osd-markdown.sh
index f655021f3f4a..aa67d9e77068 100755
--- a/src/test/osd/osd-markdown.sh
+++ b/src/test/osd/osd-markdown.sh
@@ -56,6 +56,7 @@ function TEST_markdown_exceed_maxdown_count() {
     local dir=$1
 
     run_mon $dir a || return 1
+    run_mgr $dir x || return 1
     run_osd $dir 0 || return 1
     run_osd $dir 1 || return 1
     run_osd $dir 2 || return 1
@@ -75,6 +76,7 @@ function TEST_markdown_boot() {
     local dir=$1
 
     run_mon $dir a || return 1
+    run_mgr $dir x || return 1
     run_osd $dir 0 || return 1
     run_osd $dir 1 || return 1
     run_osd $dir 2 || return 1
@@ -96,6 +98,7 @@ function TEST_markdown_boot_exceed_time() {
     local dir=$1
 
     run_mon $dir a || return 1
+    run_mgr $dir x || return 1
     run_osd $dir 0 || return 1
     run_osd $dir 1 || return 1
     run_osd $dir 2 || return 1
diff --git a/src/test/osd/osd-reactivate.sh b/src/test/osd/osd-reactivate.sh
index 311bda457bca..5088baf4eb45 100755
--- a/src/test/osd/osd-reactivate.sh
+++ b/src/test/osd/osd-reactivate.sh
@@ -37,6 +37,7 @@ function TEST_reactivate() {
     local dir=$1
 
     run_mon $dir a || return 1
+    run_mgr $dir x || return 1
     run_osd $dir 0 || return 1
 
     kill_daemons $dir TERM osd || return 1
diff --git a/src/test/osd/osd-reuse-id.sh b/src/test/osd/osd-reuse-id.sh
index 74f3fe38699c..fb0afb138865 100755
--- a/src/test/osd/osd-reuse-id.sh
+++ b/src/test/osd/osd-reuse-id.sh
@@ -37,6 +37,7 @@ function TEST_reuse_id() {
 
     setup $dir || return 1
     run_mon $dir a --osd_pool_default_size=1 || return 1
+    run_mgr $dir x || return 1
     run_osd $dir 0 || return 1
     run_osd $dir 1 || return 1
     wait_for_clean || return 1
diff --git a/src/test/osd/osd-scrub-repair.sh b/src/test/osd/osd-scrub-repair.sh
index a912933c0c85..b98ef9903404 100755
--- a/src/test/osd/osd-scrub-repair.sh
+++ b/src/test/osd/osd-scrub-repair.sh
@@ -75,6 +75,7 @@ function TEST_corrupt_and_repair_replicated() {
 
     setup $dir || return 1
     run_mon $dir a --osd_pool_default_size=2 || return 1
+    run_mgr $dir x || return 1
     run_osd $dir 0 || return 1
     run_osd $dir 1 || return 1
     wait_for_clean || return 1
@@ -182,6 +183,7 @@ function TEST_auto_repair_erasure_coded() {
     # Launch a cluster with 5 seconds scrub interval
     setup $dir || return 1
     run_mon $dir a || return 1
+    run_mgr $dir x || return 1
     local ceph_osd_args="--osd-scrub-auto-repair=true \
             --osd-deep-scrub-interval=5 \
             --osd-scrub-max-interval=5 \
@@ -227,6 +229,7 @@ function TEST_corrupt_and_repair_jerasure() {
 
     setup $dir || return 1
     run_mon $dir a || return 1
+    run_mgr $dir x || return 1
     for id in $(seq 0 3) ; do
         run_osd $dir $id || return 1
     done
@@ -247,6 +250,7 @@ function TEST_corrupt_and_repair_lrc() {
 
     setup $dir || return 1
     run_mon $dir a || return 1
+    run_mgr $dir x || return 1
     for id in $(seq 0 9) ; do
         run_osd $dir $id || return 1
     done
@@ -269,6 +273,7 @@ function TEST_unfound_erasure_coded() {
 
     setup $dir || return 1
     run_mon $dir a || return 1
+    run_mgr $dir x || return 1
     run_osd $dir 0 || return 1
     run_osd $dir 1 || return 1
     run_osd $dir 2 || return 1
@@ -324,6 +329,7 @@ function TEST_list_missing_erasure_coded() {
 
     setup $dir || return 1
     run_mon $dir a || return 1
+    run_mgr $dir x || return 1
     for id in $(seq 0 2) ; do
         run_osd $dir $id || return 1
     done
@@ -393,6 +399,7 @@ function TEST_corrupt_scrub_replicated() {
 
     setup $dir || return 1
     run_mon $dir a --osd_pool_default_size=2 || return 1
+    run_mgr $dir x || return 1
     run_osd $dir 0 || return 1
     run_osd $dir 1 || return 1
     wait_for_clean || return 1
@@ -1509,6 +1516,7 @@ function TEST_corrupt_scrub_erasure() {
 
     setup $dir || return 1
     run_mon $dir a || return 1
+    run_mgr $dir x || return 1
     for id in $(seq 0 2) ; do
         run_osd $dir $id || return 1
     done
@@ -2163,6 +2171,7 @@ function TEST_periodic_scrub_replicated() {
 
     setup $dir || return 1
     run_mon $dir a --osd_pool_default_size=2 || return 1
+    run_mgr $dir x || return 1
     local ceph_osd_args="--osd-scrub-interval-randomize-ratio=0 --osd-deep-scrub-randomize-ratio=0"
     run_osd $dir 0 $ceph_osd_args || return 1
     run_osd $dir 1 $ceph_osd_args || return 1
diff --git a/src/test/osd/osd-scrub-snaps.sh b/src/test/osd/osd-scrub-snaps.sh
index 558ce6e2d61b..5410e820c4ab 100755
--- a/src/test/osd/osd-scrub-snaps.sh
+++ b/src/test/osd/osd-scrub-snaps.sh
@@ -40,6 +40,7 @@ function TEST_scrub_snaps() {
 
     setup $dir || return 1
     run_mon $dir a --osd_pool_default_size=1 || return 1
+    run_mgr $dir x || return 1
     run_osd $dir 0 || return 1
 
     wait_for_clean || return 1