diff options
author | Greg Farnum <gregory.farnum@dreamhost.com> | 2012-03-01 18:31:49 -0800 |
---|---|---|
committer | Greg Farnum <gregory.farnum@dreamhost.com> | 2012-03-02 12:32:36 -0800 |
commit | 26e48f4234c051edeeac6e7ba739f911d9454b9a (patch) | |
tree | eaefc0e98466cc291d0a130a3126417b8e2f9232 /src/ceph_mds.cc | |
parent | 29be52820d6b16cb606741bc69cc6baebd14bc5b (diff) | |
download | ceph-26e48f4234c051edeeac6e7ba739f911d9454b9a.tar.gz |
msgr: Require that init functions are called before bind() and start().
Fix up callers to handle these constraints.
Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
Diffstat (limited to 'src/ceph_mds.cc')
-rw-r--r-- | src/ceph_mds.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc index 76aefd7609c..ed85338e1f5 100644 --- a/src/ceph_mds.cc +++ b/src/ceph_mds.cc @@ -236,10 +236,6 @@ int main(int argc, const char **argv) messenger->set_cluster_protocol(CEPH_MDS_PROTOCOL); messenger->set_nonce(getpid()); - int r = messenger->bind(g_conf->public_addr); - if (r < 0) - exit(1); - cout << "starting " << g_conf->name << " at " << messenger->get_ms_addr() << std::endl; uint64_t supported = @@ -260,6 +256,10 @@ int main(int argc, const char **argv) messenger->set_policy(entity_name_t::TYPE_CLIENT, Messenger::Policy::stateful_server(supported, 0)); + int r = messenger->bind(g_conf->public_addr); + if (r < 0) + exit(1); + if (shadow != MDSMap::STATE_ONESHOT_REPLAY) global_init_daemonize(g_ceph_context, 0); common_init_finish(g_ceph_context); |