config: Remove g_conf.num_osd, num_mds, num_mon

These configuration options don't serve any use and were confusing.

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/config.cc b/src/config.cc
index 5e9528dce700f6468f2e2a8107fb6acf3a6801d3..4aa9c34ef4dc741d5f0e69528e04172853614d3f 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -230,9 +230,6 @@ static struct config_option config_optionsp[] = {
        OPTION(host, 0, OPT_STR, "localhost"),
        OPTION(public_addr, 0, OPT_ADDR, ""),
        OPTION(cluster_addr, 0, OPT_ADDR, ""),
-       OPTION(num_mon, 0, OPT_INT, 1),
-       OPTION(num_mds, 0, OPT_INT, 1),
-       OPTION(num_osd, 0, OPT_INT, 4),
        OPTION(num_client, 0, OPT_INT, 1),
        OPTION(monmap, 'M', OPT_STR, 0),
        OPTION(mon_host, 'm', OPT_STR, 0),

diff --git a/src/config.h b/src/config.h
index 004159eed5346ad2c0193a80174353296ac16c2e..a0d5c2fc2225d946358858fb04a554912da71363 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -53,9 +53,6 @@ struct md_config_t {
   char *alt_name;
   char *host;
 
-  int num_mon;
-  int num_mds;
-  int num_osd;
   int num_client;
 
   //bool mkfs;

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index 246fa8384e844a5998e279add5c0a8dfbaeeeea4..e7d955522107c3ff79159a0cc3cd56a627ef5722 100644 (file)
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -796,54 +796,16 @@ private:
     ps_t pps = pool.raw_pg_to_pps(pg);  // placement ps
     unsigned size = pool.get_size();
 
-    switch (g_conf.osd_pg_layout) {
-    case CEPH_PG_LAYOUT_CRUSH:
-      {
-       int preferred = pg.preferred();
-       if (preferred >= max_osd || preferred >= crush.get_max_devices())
-         preferred = -1;
-
-       // what crush rule?
-       int ruleno = crush.find_rule(pool.get_crush_ruleset(), pool.get_type(), size);
-       if (ruleno >= 0)
-         crush.do_rule(ruleno, pps, osds, size, preferred, osd_weight);
-      }
-      break;
-      
-    case CEPH_PG_LAYOUT_LINEAR:
-      for (unsigned i=0; i<size; i++) 
-       osds.push_back( (i + pps*size) % g_conf.num_osd );
-      break;
-      
-#if 0
-    case CEPH_PG_LAYOUT_HYBRID:
-      {
-       int h = crush_hash32(CRUSH_HASH_RJENKINS1, pps);
-       for (unsigned i=0; i<size; i++) 
-         osds.push_back( (h+i) % g_conf.num_osd );
-      }
-      break;
-      
-    case CEPH_PG_LAYOUT_HASH:
-      {
-       for (unsigned i=0; i<size; i++) {
-         int t = 1;
-         int osd = 0;
-         while (t++) {
-           osd = crush_hash32_3(CRUSH_HASH_RJENKINS1, i, pps, t) % g_conf.num_osd;
-           unsigned j = 0;
-           for (; j<i; j++) 
-             if (osds[j] == osd) break;
-           if (j == i) break;
-         }
-         osds.push_back(osd);
-       }      
-      }
-      break;
-#endif
-      
-    default:
-      assert(0);
+    assert(g_conf.osd_pg_layout == CEPH_PG_LAYOUT_CRUSH);
+    {
+      int preferred = pg.preferred();
+      if (preferred >= max_osd || preferred >= crush.get_max_devices())
+       preferred = -1;
+
+      // what crush rule?
+      int ruleno = crush.find_rule(pool.get_crush_ruleset(), pool.get_type(), size);
+      if (ruleno >= 0)
+       crush.do_rule(ruleno, pps, osds, size, preferred, osd_weight);
     }
   
     // no crush, but forcefeeding?