osdmap: Don't create FS pools by default

Because many Ceph users don't use the filesystem,
don't create the 'data' and 'metadata' pools by
default -- they will be created by newfs if
they are needed.

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

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 8d2a346fb64b8a271aad869b40cdf6e4a062910c..527efdf62ee0b5591220a08465effbc528145e1f 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -2518,8 +2518,6 @@ int OSDMap::build_simple(CephContext *cct, epoch_t e, uuid_d &fsid,
     pgp_bits = pg_bits;
 
   vector<string> pool_names;
-  pool_names.push_back("data");
-  pool_names.push_back("metadata");
   pool_names.push_back("rbd");
 
   stringstream ss;
@@ -2548,8 +2546,6 @@ int OSDMap::build_simple(CephContext *cct, epoch_t e, uuid_d &fsid,
     pools[pool].set_pg_num(poolbase << pg_bits);
     pools[pool].set_pgp_num(poolbase << pgp_bits);
     pools[pool].last_change = epoch;
-    if (*p == "data")
-      pools[pool].crash_replay_interval = cct->_conf->osd_default_data_pool_replay_window;
     pool_name[pool] = *p;
     name_pool[*p] = pool;
   }