From: Sage Weil <sage@redhat.com>
Date: Fri, 15 Apr 2016 13:14:34 +0000 (-0400)
Subject: osd: some debug output for old osdmap trimming
X-Git-Tag: v10.2.0~16^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8613%2Fhead;p=ceph.git

osd: some debug output for old osdmap trimming

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 7c260ff39aea..2c795563db2d 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6692,9 +6692,11 @@ void OSD::handle_osd_map(MOSDMap *m)
 
   if (superblock.oldest_map) {
     int num = 0;
-    epoch_t min(
-      MIN(m->oldest_map,
-	  service.map_cache.cached_key_lower_bound()));
+    epoch_t cache_lb = service.map_cache.cached_key_lower_bound();
+    epoch_t min = MIN(m->oldest_map, cache_lb);
+    dout(20) << __func__ << " oldest_map " << m->oldest_map
+	     << " cache lb " << cache_lb
+	     << " min " << min << dendl;
     for (epoch_t e = superblock.oldest_map; e < min; ++e) {
       dout(20) << " removing old osdmap epoch " << e << dendl;
       t.remove(coll_t::meta(), get_osdmap_pobject_name(e));