From 7e8bf01024b5066334b071e6cdc74abfad6da26a Mon Sep 17 00:00:00 2001 From: Bassam Tabbara Date: Sat, 5 Nov 2016 16:00:11 -0700 Subject: [PATCH] mon: exclude kv_backend from dir empty check check_mon_data_empty required a completely empty dir. this made it impossible to mkfs a mondir that uses rocksdb given the requirement that kv_backend file exist in the mon datadir. Signed-off-by: Bassam Tabbara --- src/ceph_mon.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc index 172c9e78ecd..3b15e56cc34 100644 --- a/src/ceph_mon.cc +++ b/src/ceph_mon.cc @@ -140,7 +140,8 @@ int check_mon_data_empty() errno = 0; while ((de = ::readdir(dir))) { if (string(".") != de->d_name && - string("..") != de->d_name) { + string("..") != de->d_name && + string("kv_backend") != de->d_name) { code = -ENOTEMPTY; break; } -- 2.39.5