update sources to v12.1.1

[ceph.git] / ceph / src / test / osd / osd-fast-mark-down.sh

diff --git a/ceph/src/test/osd/osd-fast-mark-down.sh b/ceph/src/test/osd/osd-fast-mark-down.sh
index 5c8f420fecbb4d3863d90575d470968d5a2ef897..051b7d32815a2a7df88473675a7af0d162648cb7 100755 (executable)
--- a/ceph/src/test/osd/osd-fast-mark-down.sh
+++ b/ceph/src/test/osd/osd-fast-mark-down.sh
@@ -28,6 +28,25 @@ function run() {
     export CEPH_ARGS
     CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none "
     CEPH_ARGS+="--mon-host=$CEPH_MON "
+    #
+    # Disable device auto class feature for this testing,
+    # as it will automatically make root clones based on new class types
+    # and hence affect the down osd counting.
+    # E.g.,
+    #
+    # ID WEIGHT  TYPE NAME                                            UP/DOWN REWEIGHT PRIMARY-AFFINITY 
+    # -4 3.00000 root default~hdd                                                                       
+    # -3 3.00000     host gitbuilder-ceph-rpm-centos7-amd64-basic~hdd                                   
+    #  0 1.00000         osd.0                                           down  1.00000          1.00000 
+    #  1 1.00000         osd.1                                             up  1.00000          1.00000 
+    #  2 1.00000         osd.2                                             up  1.00000          1.00000 
+    # -1 3.00000 root default                                                                           
+    # -2 3.00000     host gitbuilder-ceph-rpm-centos7-amd64-basic                                       
+    #  0 1.00000         osd.0                                           down  1.00000          1.00000 
+    #  1 1.00000         osd.1                                             up  1.00000          1.00000 
+    #  2 1.00000         osd.2                                             up  1.00000          1.00000   
+    #
+    CEPH_ARGS+="--osd-class-update-on-start=false "
     
     OLD_ARGS=$CEPH_ARGS
     CEPH_ARGS+="--osd-fast-fail-on-connection-refused=false "
@@ -53,7 +72,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
+   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)