osd_pg_bits means per osd

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1748 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/trunk/ceph/config.cc b/trunk/ceph/config.cc
index 00cfa46458ac6805d5e3f9e2e0954f223340f5f8..97efd6582da2f551c94115592a24d54f5abe3dd4 100644 (file)
--- a/trunk/ceph/config.cc
+++ b/trunk/ceph/config.cc
@@ -260,7 +260,7 @@ md_config_t g_conf = {
 
   osd_stat_refresh_interval: .5,
 
-  osd_pg_bits: 0,  // 0 == let osdmonitor decide
+  osd_pg_bits: 4,  // bits per osd
   osd_object_layout: OBJECT_LAYOUT_HASHINO,
   osd_pg_layout: PG_LAYOUT_CRUSH,
   osd_max_rep: 4,

diff --git a/trunk/ceph/mon/OSDMonitor.cc b/trunk/ceph/mon/OSDMonitor.cc
index a095c1d62e20c89ac3441fa1b6ceb2250ad9d033..6c9dcb3c9655dbf0e4fe67fb89a10da387853641 100644 (file)
--- a/trunk/ceph/mon/OSDMonitor.cc
+++ b/trunk/ceph/mon/OSDMonitor.cc
@@ -114,12 +114,7 @@ void OSDMonitor::create_initial()
   newmap.mon_epoch = mon->mon_epoch;
   newmap.ctime = g_clock.now();
 
-  if (g_conf.osd_pg_bits) {
-    newmap.set_pg_num(1 << g_conf.osd_pg_bits);
-  } else {
-    // 4 bits of pgs per osd.
-    newmap.set_pg_num(g_conf.num_osd << 4);
-  }
+  newmap.set_pg_num(g_conf.num_osd << g_conf.osd_pg_bits);
   
   // start at epoch 1 until all osds boot
   newmap.inc_epoch();  // = 1