osd: ignore CEPH_OSD_EXISTS status bit until we have a real use for it

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 89248f85e1273b38c097cfb92e2275097caac70f..6706c442447a9f6a19351f8e5263e033750d20cb 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -45,8 +45,8 @@ void OSDMap::build_simple(epoch_t e, ceph_fsid &fsid,
     // add mds local osds, but don't put them in the crush mapping func
     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_OUT);
+      set_state(i+num_osd, CEPH_OSD_EXISTS);
+      set_offload(i+num_osd, CEPH_OSD_OUT);
     }
   }
 }

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index a43e2fdd6c23731c493122e3d6a5a0f6ebf16185..46d4ba14fdd38347c353ede12b3924f0e2d89409 100644 (file)
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -270,20 +270,21 @@ private:
   int get_num_osds() { 
     int n = 0;
     for (int i=0; i<max_osd; i++)
-      if (osd_state[i] & CEPH_OSD_EXISTS) n++;
+      //if (osd_state[i] & CEPH_OSD_EXISTS) 
+       n++;
     return n;
   }
   int get_num_up_osds() {
     int n = 0;
     for (int i=0; i<max_osd; i++)
-      if (osd_state[i] & CEPH_OSD_EXISTS &&
+      if (//osd_state[i] & CEPH_OSD_EXISTS &&
          osd_state[i] & CEPH_OSD_UP) n++;
     return n;
   }
   int get_num_in_osds() {
     int n = 0;
     for (int i=0; i<max_osd; i++)
-      if (osd_state[i] & CEPH_OSD_EXISTS &&
+      if (//osd_state[i] & CEPH_OSD_EXISTS &&
          crush.get_offload(i) != CEPH_OSD_OUT) n++;
     return n;
   }
@@ -300,7 +301,7 @@ private:
     crush.set_offload(o, off);
   }
 
-  bool exists(int osd) { return osd < max_osd && osd_state[osd] & CEPH_OSD_EXISTS; }
+  bool exists(int osd) { return osd < max_osd/* && osd_state[osd] & CEPH_OSD_EXISTS*/; }
   bool is_up(int osd) { return exists(osd) && osd_state[osd] & CEPH_OSD_UP; }
   bool is_down(int osd) { assert(exists(osd)); return !is_up(osd); }
   bool is_down_clean(int osd) {