From: Sage Weil <sage@redhat.com>
Date: Thu, 12 Feb 2015 21:51:17 +0000 (-0800)
Subject: mon/OSDMonitor: note osd map epoch in one other place
X-Git-Tag: v0.93~20^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3722%2Fhead;p=ceph.git

mon/OSDMonitor: note osd map epoch in one other place

Also add a note about why we don't do it in another.

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 16840b8048f3..e169a8757f6b 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1010,6 +1010,8 @@ void OSDMonitor::share_map_with_random_osd()
   // whatev, they'll request more if they need it
   MOSDMap *m = build_incremental(osdmap.get_epoch() - 1, osdmap.get_epoch());
   s->con->send_message(m);
+  // NOTE: do *not* record osd has up to this epoch (as we do
+  // elsewhere) as they may still need to request older values.
 }
 
 version_t OSDMonitor::get_trim_to()
@@ -2210,6 +2212,10 @@ void OSDMonitor::send_incremental(epoch_t first, MonSession *session,
     MOSDMap *m = build_incremental(first, last);
     session->con->send_message(m);
     first = last + 1;
+
+    if (session->inst.name.is_osd())
+      note_osd_has_epoch(session->inst.name.num(), last);
+
     if (onetime)
       break;
   }