From: Sage Weil <sage@redhat.com>
Date: Fri, 18 Mar 2016 01:46:45 +0000 (-0400)
Subject: Merge branch 'wip-13990' of git://github.com/tchaikov/ceph
X-Git-Tag: v10.1.0~45
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e50ba1140d9d463fb156e81a7e19c0c2ad0785bf;p=ceph.git

Merge branch 'wip-13990' of git://github.com/tchaikov/ceph

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

e50ba1140d9d463fb156e81a7e19c0c2ad0785bf
diff --cc src/osd/OSD.cc
index 3046378ee083e,673454b3286c5..cd9d2671217d5
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@@ -6578,12 -6566,15 +6580,16 @@@ void OSD::handle_osd_map(MOSDMap *m
  
    logger->inc(l_osd_map);
    logger->inc(l_osd_mape, last - first + 1);
 -  if (first <= osdmap->get_epoch())
 -    logger->inc(l_osd_mape_dup, osdmap->get_epoch() - first + 1);
 +  if (first <= superblock.newest_map)
 +    logger->inc(l_osd_mape_dup, superblock.newest_map - first + 1);
+   if (service.max_oldest_map < m->oldest_map) {
+     service.max_oldest_map = m->oldest_map;
+     assert(service.max_oldest_map >= superblock.oldest_map);
+   }
  
 -  // make sure there is something new, here, before we bother flushing the queues and such
 -  if (last <= osdmap->get_epoch()) {
 +  // make sure there is something new, here, before we bother flushing
 +  // the queues and such
 +  if (last <= superblock.newest_map) {
      dout(10) << " no new maps here, dropping" << dendl;
      m->put();
      return;