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_mon.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_mon.cc')
| -rw-r--r-- | src/ceph_mon.cc | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc index 02d9ec45fc4..c9e6d37cc7a 100644 --- a/src/ceph_mon.cc +++ b/src/ceph_mon.cc @@ -370,6 +370,22 @@ int main(int argc, const char **argv) SimpleMessenger *messenger = new SimpleMessenger(g_ceph_context, entity_name_t::MON(rank)); messenger->set_cluster_protocol(CEPH_MON_PROTOCOL); + messenger->set_default_send_priority(CEPH_MSG_PRIO_HIGH); + + uint64_t supported = + CEPH_FEATURE_UID | + CEPH_FEATURE_NOSRCADDR | + CEPH_FEATURE_MONCLOCKCHECK | + CEPH_FEATURE_PGID64; + messenger->set_default_policy(Messenger::Policy::stateless_server(supported, 0)); + messenger->set_policy(entity_name_t::TYPE_MON, + Messenger::Policy::lossless_peer(supported, + CEPH_FEATURE_UID | + CEPH_FEATURE_PGID64)); + messenger->set_policy(entity_name_t::TYPE_OSD, + Messenger::Policy::stateless_server(supported, + CEPH_FEATURE_PGID64 | + CEPH_FEATURE_OSDENC)); global_print_banner(); @@ -384,7 +400,6 @@ int main(int argc, const char **argv) return 1; // start monitor - messenger->set_default_send_priority(CEPH_MSG_PRIO_HIGH); mon = new Monitor(g_ceph_context, g_conf->name.get_id(), &store, messenger, &monmap); global_init_daemonize(g_ceph_context, 0); @@ -398,20 +413,6 @@ int main(int argc, const char **argv) register_async_signal_handler_oneshot(SIGINT, handle_mon_signal); register_async_signal_handler_oneshot(SIGTERM, handle_mon_signal); - uint64_t supported = - CEPH_FEATURE_UID | - CEPH_FEATURE_NOSRCADDR | - CEPH_FEATURE_MONCLOCKCHECK | - CEPH_FEATURE_PGID64; - messenger->set_default_policy(Messenger::Policy::stateless_server(supported, 0)); - messenger->set_policy(entity_name_t::TYPE_MON, - Messenger::Policy::lossless_peer(supported, - CEPH_FEATURE_UID | - CEPH_FEATURE_PGID64)); - messenger->set_policy(entity_name_t::TYPE_OSD, - Messenger::Policy::stateless_server(supported, - CEPH_FEATURE_PGID64 | - CEPH_FEATURE_OSDENC)); mon->init(); messenger->wait(); |