update sources to v12.1.0

[ceph.git] / ceph / src / test / osd / osd-dup.sh

diff --git a/ceph/src/test/osd/osd-dup.sh b/ceph/src/test/osd/osd-dup.sh
index f82a85b9080891ac5effe6bc35859ec733b8a1dd..f497005d168a72525313b03b320dbecbee8e084f 100755 (executable)
--- a/ceph/src/test/osd/osd-dup.sh
+++ b/ceph/src/test/osd/osd-dup.sh
@@ -11,7 +11,6 @@ function run() {
     export CEPH_ARGS
     CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none "
     CEPH_ARGS+="--mon-host=$CEPH_MON "
-    CEPH_ARGS+="--enable-experimental-unrecoverable-data-corrupting-features bluestore "
     # avoid running out of fds in rados bench
     CEPH_ARGS+="--filestore_wbthrottle_xfs_ios_hard_limit=900 "
     CEPH_ARGS+="--filestore_wbthrottle_btrfs_ios_hard_limit=900 "
@@ -32,6 +31,7 @@ function TEST_filestore_to_bluestore() {
     fi
 
     run_mon $dir a || return 1
+    run_mgr $dir x || return 1
     run_osd $dir 0 || return 1
     osd_pid=$(cat $dir/osd.0.pid)
     run_osd $dir 1 || return 1
@@ -60,7 +60,7 @@ function TEST_filestore_to_bluestore() {
                          --op dup || return 1
     CEPH_ARGS=$O
 
-    run_osd $dir 0 || return 1
+    run_osd_bluestore $dir 0 || return 1
 
     while ! ceph osd stat | grep '3 up' ; do sleep 1 ; done
     ceph osd metadata 0 | grep bluestore || return 1
@@ -69,8 +69,10 @@ function TEST_filestore_to_bluestore() {
 
     # give it some time
     sleep 15
+    # and make sure mon is sync'ed
+    flush_pg_stats
 
-    ceph -s | grep '20 active+clean' || return 1
+    wait_for_clean || return 1
 }
 
 main osd-dup "$@"