osd: fix startup after mkfs when osds dont come up in unison

diff --git a/src/TODO b/src/TODO
index b59532d085ed90c211e16d4b740428a1443abab0..10e0d612764baaa99d5b40d9de43563c2d1595b6 100644 (file)
--- a/src/TODO
+++ b/src/TODO
@@ -6,7 +6,6 @@ gsoc?
 
 - online changes to pg_num
 - initialization of pg_num during non-simple mkfs...
-- review/remove post_mkfs hacks in PG.cc??
 
 code cleanup
 - userspace encoding/decoding needs major cleanup

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 070f6b7eb94a93c9d7431c4e1612df1f64c732af..03561a0df15d59621746ed9ddb0920f8eb6b1b9d 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1409,7 +1409,7 @@ void OSD::advance_map(ObjectStore::Transaction& t)
     ps_t numps = osdmap->get_pg_num();
     ps_t fromps = osdmap->get_prior_pg_num();
     ps_t numlps = osdmap->get_localized_pg_num();
-    ps_t fromlps = osdmap->get_prior_pg_num();
+    ps_t fromlps = osdmap->get_prior_localized_pg_num();
     dout(1) << "mkpg " << osdmap->get_fsid() << " on " 
            << fromps << "-" << numps << " normal, " 
            << fromlps << "-" << numlps << " localized pg sets" << dendl;

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 1b0d36566940e196d7bfa14b251b3a115b6eafb4..a7c3da120abb19c59cb5bd68c7f01324dda6ce9f 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -37,7 +37,7 @@ void OSDMap::build_simple(epoch_t e, ceph_fsid &fsid,
 
   for (int i=0; i<num_osd; i++) {
     set_state(i, CEPH_OSD_EXISTS|CEPH_OSD_CLEAN);
-    set_offload(i, CEPH_OSD_IN);
+    set_offload(i, CEPH_OSD_OUT);
   }
   
   if (mds_local_osd) {
@@ -47,7 +47,7 @@ void OSDMap::build_simple(epoch_t e, ceph_fsid &fsid,
     for (int i=0; i<mds_local_osd; i++) {
       set_max_osd(i+num_osd);
       set_state(i, CEPH_OSD_EXISTS);
-      set_offload(i, CEPH_OSD_IN);
+      set_offload(i, CEPH_OSD_OUT);
     }
   }
 }

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index 5d779c386d94306c8ec19d68ede3ec6aa4c92676..00e66f8c2808d7f132f246feea365440de9613ac 100644 (file)
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -286,7 +286,7 @@ private:
     ctime = inc.ctime;
 
     prior_pg_num = pg_num;
-    prior_localized_pg_num = prior_localized_pg_num;
+    prior_localized_pg_num = localized_pg_num;
       
     // full map?
     if (inc.fullmap.length()) {

diff --git a/src/start.sh b/src/start.sh
index 9348bf53d49d53a821bd9ab14284cdce7c6e2814..4466874441d53ad1d8d25dd7f3d0d8737e253afc 100755 (executable)
--- a/src/start.sh
+++ b/src/start.sh
@@ -38,7 +38,7 @@ $CEPH_BIN/cmonctl osd setmap -i .ceph_osdmap
 for osd in 0 1 2 3 
 do
  $CEPH_BIN/cosd --mkfs_for_osd $osd dev/osd$osd  # initialize empty object store
- $CEPH_BIN/cosd $ARGS dev/osd$osd
+ $CEPH_BIN/cosd $ARGS dev/osd$osd --debug_osd 10
 done
 
 # mds