osdmap: break up asserts for easier debugging

If we fail one of these it's helpful to know which one.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index a2c4479429a57af0deca13fe5b9a09122d01a7f9..447bc8a93fc5f5ff222416d4590f9b05ee65d112 100644 (file)
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -469,12 +469,14 @@ private:
     return osd_hb_addr[osd];
   }
   entity_inst_t get_inst(int osd) {
-    assert(exists(osd) && is_up(osd));
+    assert(exists(osd));
+    assert(is_up(osd));
     return entity_inst_t(entity_name_t::OSD(osd),
                         osd_addr[osd]);
   }
   entity_inst_t get_cluster_inst(int osd) {
-    assert(exists(osd) && is_up(osd));
+    assert(exists(osd));
+    assert(is_up(osd));
     if (osd_cluster_addr[osd] == entity_addr_t())
       return get_inst(osd);
     return entity_inst_t(entity_name_t::OSD(osd), osd_cluster_addr[osd]);