From: John Spray <john.spray@inktank.com>
Date: Tue, 29 Apr 2014 14:14:42 +0000 (+0100)
Subject: mds: no initial filesystem
X-Git-Tag: v0.84~164^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=13305d5b0cea07b56b65812189bd086916cf61fb;p=ceph.git

mds: no initial filesystem

Because not everyone uses CephFS, we would
like to avoid initially creating any data/metadata
pools for CephFS.

To avoid creating those pools, we must avoid initially
populating the MDSMap.

Signed-off-by: John Spray <john.spray@inktank.com>
---

diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h
index a7e495c72038..17a0e3a5fa47 100644
--- a/src/mds/mdstypes.h
+++ b/src/mds/mdstypes.h
@@ -37,10 +37,6 @@ using namespace std;
 #define MDS_PORT_LOCKER  0x300
 #define MDS_PORT_MIGRATOR 0x400
 
-// FIXME: this should not be hardcoded
-#define MDS_DATA_POOL		0
-#define MDS_METADATA_POOL	1
-
 #define MAX_MDS                   0x100
 #define NUM_STRAY                 10
 
diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index f233561c9766..f225197288cc 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -79,7 +79,9 @@ void MDSMonitor::create_new_fs(MDSMap &m, int metadata_pool, int data_pool)
 void MDSMonitor::create_initial()
 {
   dout(10) << "create_initial" << dendl;
-  create_new_fs(pending_mdsmap, MDS_METADATA_POOL, MDS_DATA_POOL);
+
+  // Initial state is a disable MDS map
+  assert(mdsmap.enabled != true);
 }