From: Sage Weil <sage@inktank.com>
Date: Sat, 17 Aug 2013 06:27:39 +0000 (-0700)
Subject: osdc/Objecter: only request map on startup if epoch == 0
X-Git-Tag: v0.69~27^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=42b3d55ddb2cacd138003db986baf62a9d452a3d;p=ceph.git

osdc/Objecter: only request map on startup if epoch == 0

Normal clients have no map and need one to get started.  If we are the
OSD, we will already have one and will get fed maps as they come in.

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

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 39378521b097..af6ebd6ae179 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -229,7 +229,8 @@ void Objecter::init_locked()
   assert(!initialized);
 
   schedule_tick();
-  maybe_request_map();
+  if (osdmap->get_epoch() == 0)
+    maybe_request_map();
 
   initialized = true;
 }