osd: fixed up some debug output

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 8899d744675a7bb637ea878b187156375d6af1df..3bd2ba310d5f1153fd86849ce93950877acbc6c9 100644 (file)
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -96,7 +96,7 @@ struct btrfs_ioctl_usertrans {
 
 #define DOUT_SUBSYS filestore
 #undef dout_prefix
-#define dout_prefix *_dout << dbeginl << "filestore(" << basedir << ") "
+#define dout_prefix *_dout << dbeginl << pthread_self() << " filestore(" << basedir << ") "
 
 #include "include/buffer.h"
 

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 234bee51de797d686f107d37e98550ac8868eb86..7ec176d823551fe9a5849759d843f56876a2a134 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1099,11 +1099,12 @@ void OSD::heartbeat()
        p != heartbeat_from.end();
        p++) {
     if (heartbeat_from_stamp.count(p->first)) {
-      if (!osdmap->is_up(p->first) || osdmap->get_hb_inst(p->first) != heartbeat_inst[p->first]) {
+      if (!osdmap->is_up(p->first)) {
+       dout(10) << "not checking timeout on down osd" << p->first << dendl;
+      } else if (osdmap->get_hb_inst(p->first) != heartbeat_inst[p->first]) {
        dout(10) << "not checking timeout on osd" << p->first
-                << " whose up " << osdmap->is_up(p->first)
-                << " != 1 || hb inst " << heartbeat_inst[p->first]
-                << " != map's "
+                << " hb inst " << heartbeat_inst[p->first]
+                << " != map's " << osdmap->get_hb_inst(p->first)
                 << dendl;
       } else if (heartbeat_from_stamp[p->first] < grace) {
        dout(0) << "no heartbeat from osd" << p->first
@@ -3339,6 +3340,7 @@ void OSD::_remove_pg(PG *pg)
   }
 
   pg->unlock();
+  dout(10) << "_remove_pg " << pgid << " taking osd_lock" << dendl;
   osd_lock.Lock();
   pg->lock();