From: Bassam Tabbara <bassam.tabbara@quantum.com>
Date: Sat, 5 Nov 2016 23:00:11 +0000 (-0700)
Subject: mon: exclude kv_backend from dir empty check
X-Git-Tag: v11.1.0~311^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7e8bf01024b5066334b071e6cdc74abfad6da26a;p=ceph.git

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 <bassam.tabbara@quantum.com>
---

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 172c9e78ecdb..3b15e56cc343 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;
     }