summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-08-16 23:27:39 -0700
committerSage Weil <sage@inktank.com>2013-08-26 16:17:10 -0700
commitdea45a9a1c3c73d8add88c7fd807305a6c8607e3 (patch)
tree5b2686e1ca88662ad640d1b6aac0270907c6d9c6
parent0fb8c0dccedfbe2a565a43db759b4c4ec87f7d8e (diff)
downloadceph-dea45a9a1c3c73d8add88c7fd807305a6c8607e3.tar.gz
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>
-rw-r--r--src/osdc/Objecter.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index f94dc7baf6c..c66f5a275b7 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;
}