tests: tolerate a disk 99% full

The tests do not need much space and will work fine even on a 99% full
disk.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>

diff --git a/src/test/ceph-disk.sh b/src/test/ceph-disk.sh
index 3ea3c4b54c0a8aec923c513f1b2791b823399685..081b1fb0562b9e6bad3103b00226a50b0aa2fec4 100755 (executable)
--- a/src/test/ceph-disk.sh
+++ b/src/test/ceph-disk.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 #
 # Copyright (C) 2014 Cloudwatt <libre.licensing@cloudwatt.com>
+# Copyright (C) 2014 Red Hat <contact@redhat.com>
 #
 # Author: Loic Dachary <loic@dachary.org>
 #
@@ -30,6 +31,7 @@ export CEPH_CONF=/dev/null
 export CEPH_ARGS="--fsid $FSID"
 CEPH_ARGS+=" --chdir="
 CEPH_ARGS+=" --run-dir=$DIR"
+CEPH_ARGS+=" --osd-failsafe-full-ratio=.99"
 CEPH_ARGS+=" --mon-host=$MONA"
 CEPH_ARGS+=" --log-file=$DIR/\$name.log"
 CEPH_ARGS+=" --pid-file=$DIR/\$name.pidfile"
@@ -74,6 +76,8 @@ function run_mon() {
     ./ceph-mon \
         --id $MON_ID \
         --mon-data=$mon_dir \
+        --mon-osd-full-ratio=.99 \
+        --mon-data-avail-crit=1 \
         --mon-cluster-log-file=$mon_dir/log \
         --public-addr $MONA \
         "$@"

diff --git a/src/test/erasure-code/test-erasure-code.sh b/src/test/erasure-code/test-erasure-code.sh
index e7543199955d7980f1505dce6bab74ff5b303ad6..b8a10212192c827f1662db591f238fb291259452 100755 (executable)
--- a/src/test/erasure-code/test-erasure-code.sh
+++ b/src/test/erasure-code/test-erasure-code.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 #
 # Copyright (C) 2014 Cloudwatt <libre.licensing@cloudwatt.com>
+# Copyright (C) 2014 Red Hat <contact@redhat.com>
 #
 # Author: Loic Dachary <loic@dachary.org>
 #

diff --git a/src/test/mon/mkfs.sh b/src/test/mon/mkfs.sh
index c86eaf4126a1c3667fb6ed49f1a34b85d4ec541c..fbf560be26f2bdc2262402612e20ba40b1d530de 100755 (executable)
--- a/src/test/mon/mkfs.sh
+++ b/src/test/mon/mkfs.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 #
 # Copyright (C) 2013 Cloudwatt <libre.licensing@cloudwatt.com>
+# Copyright (C) 2014 Red Hat <contact@redhat.com>
 #
 # Author: Loic Dachary <loic@dachary.org>
 #
@@ -54,6 +55,8 @@ function mon_run() {
     ./ceph-mon \
         --id $MON_ID \
         --chdir= \
+        --mon-osd-full-ratio=.99 \
+        --mon-data-avail-crit=1 \
         --osd-pool-default-erasure-code-directory=.libs \
         --mon-data=$MON_DIR \
         --log-file=$MON_DIR/log \
@@ -79,6 +82,8 @@ function auth_none() {
 
     ./ceph-mon \
         --id $MON_ID \
+        --mon-osd-full-ratio=.99 \
+        --mon-data-avail-crit=1 \
         --osd-pool-default-erasure-code-directory=.libs \
         --mon-data=$MON_DIR \
         --extract-monmap $MON_DIR/monmap
@@ -144,6 +149,8 @@ function makedir() {
     # fail if recursive directory creation is needed
     ./ceph-mon \
         --id $MON_ID \
+        --mon-osd-full-ratio=.99 \
+        --mon-data-avail-crit=1 \
         --osd-pool-default-erasure-code-directory=.libs \
         --mkfs \
         --mon-data=$toodeep 2>&1 | tee $DIR/makedir.log

diff --git a/src/test/mon/mon-test-helpers.sh b/src/test/mon/mon-test-helpers.sh
index 79de8deaba88f88cef2ea8704e4894d3aaa5eebe..deeb9f38f863e89da87592fb64f793253fc64ca9 100644 (file)
--- a/src/test/mon/mon-test-helpers.sh
+++ b/src/test/mon/mon-test-helpers.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 #
 # Copyright (C) 2013,2014 Cloudwatt <libre.licensing@cloudwatt.com>
+# Copyright (C) 2014 Red Hat <contact@redhat.com>
 #
 # Author: Loic Dachary <loic@dachary.org>
 #
@@ -46,6 +47,8 @@ function run_mon() {
 
     ./ceph-mon \
         --id $id \
+        --mon-osd-full-ratio=.99 \
+        --mon-data-avail-crit=1 \
         --paxos-propose-interval=0.1 \
         --osd-crush-chooseleaf-type=0 \
         --osd-pool-default-erasure-code-directory=.libs \

diff --git a/src/test/osd/osd-test-helpers.sh b/src/test/osd/osd-test-helpers.sh
index 28d8544b6cfebcec43a803194b1c2257311234f6..4b3a8b79541e640b2e8858a7dac588647a092a6f 100644 (file)
--- a/src/test/osd/osd-test-helpers.sh
+++ b/src/test/osd/osd-test-helpers.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 #
 # Copyright (C) 2014 Cloudwatt <libre.licensing@cloudwatt.com>
+# Copyright (C) 2014 Red Hat <contact@redhat.com>
 #
 # Author: Loic Dachary <loic@dachary.org>
 #
@@ -35,6 +36,8 @@ function run_osd() {
         prepare $osd_data || return 1
 
     local ceph_args="$CEPH_ARGS"
+    ceph_args+=" --osd-backfill-full-ratio=.99"
+    ceph_args+=" --osd-failsafe-full-ratio=.99"
     ceph_args+=" --osd-journal-size=100"
     ceph_args+=" --osd-data=$osd_data"
     ceph_args+=" --chdir="

diff --git a/src/vstart.sh b/src/vstart.sh
index 82509c472e94f82f1057675f5b2ae24a9ed4630a..a062906feb7b142db01725a58f3bc7f12d333803 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -338,6 +338,9 @@ if [ "$start_mon" -eq 1 ]; then
         osd pgp bits = 5  ; (invalid, but ceph should cope!)
         osd crush chooseleaf type = 0
         osd pool default min size = 1
+        osd failsafe full ratio = .99
+        mon osd full ratio = .99
+        mon data avail crit = 1
         osd pool default erasure code directory = .libs
         osd pool default erasure code profile = plugin=jerasure technique=reed_sol_van k=2 m=1 ruleset-failure-domain=osd
         rgw frontends = fastcgi, civetweb port=$CEPH_RGW_PORT