From: Kefu Chai <kchai@redhat.com>
Date: Mon, 24 May 2021 02:21:52 +0000 (+0800)
Subject: vstart.sh: specify mon_data_avail_crit in ceph.conf
X-Git-Tag: v17.1.0~1871^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F41492%2Fhead;p=ceph.git

vstart.sh: specify mon_data_avail_crit in ceph.conf

ceph-mon consumes this option when it boots, and exits if the ratio
of free space is  lower than the specified number, which is 5% by
default. but we use `ceph -c $conf_fn config assimilate-conf -i -`
to absorb these option after monitor starts. so, without this change,
the default value of mon_data_avail_crit is always used, if machine
has lower ratio of free space on the partition where mon store is
located, ceph-mon just exists with the error message like:

2021-05-24T01:53:14.644+0000 7ff64961e580 -1 error: monitor data
filesystem reached concerning levels of available storage space
(available: 4% 17 GiB)

after this change, the option is written in ceph.conf, and can be
read by ceph-mon when it boots. so the overriden value of 1% has
the chance to take effect. this helps to address some test failures
found in our "make check" runs performed by jenkins on machines whose
disk space is enough for completing the test, but its ratio of free
space is lower than 5%.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index 5273442f5de0..ed5602931d24 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -739,6 +739,7 @@ $BLUESTORE_OPTS
 $COSDSHORT
         $(format_conf "${extra_conf}")
 [mon]
+        mon_data_avail_crit = 1
         mgr initial modules = $mgr_modules
         mgr disabled modules = rook
 $DAEMONOPTS