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 a7e495c72038d0d4892e9ac125205c8b4ebf6e9e..17a0e3a5fa47d43d2b401b2d45f366e006fc4028 100644 (file)
--- 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 f233561c976696ec58bac6e969b7b17b3b0c4871..f225197288ccb8b3a98b2747f8ce3468ff5fd752 100644 (file)
--- 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);
 }