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-30 16:54:16 -0700
commit42b3d55ddb2cacd138003db986baf62a9d452a3d (patch)
treef747dcb9ce7a269c2e9126342fd8c27c30d1406b
parentc6d0b10ed705aa682668943e4b5e4111d1c6fa1e (diff)
downloadceph-42b3d55ddb2cacd138003db986baf62a9d452a3d.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 39378521b09..af6ebd6ae17 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;
}