diff options
| author | Greg Farnum <gregory.farnum@dreamhost.com> | 2012-03-01 18:48:46 -0800 |
|---|---|---|
| committer | Greg Farnum <gregory.farnum@dreamhost.com> | 2012-03-02 12:32:36 -0800 |
| commit | 091b17601631046e092fc4fa3ce357a9d6b67250 (patch) | |
| tree | 15e7f9f4d938c20e3cd8ec4fd07de92527af6b1b /src/ceph_syn.cc | |
| parent | 26e48f4234c051edeeac6e7ba739f911d9454b9a (diff) | |
| download | ceph-091b17601631046e092fc4fa3ce357a9d6b67250.tar.gz | |
msgr: make nonce a required part of the SimpleMessenger constructor.
With that, remove the set_nonce function and the gratuitous passing
of nonce around through layers of functions.
Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
Diffstat (limited to 'src/ceph_syn.cc')
| -rw-r--r-- | src/ceph_syn.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ceph_syn.cc b/src/ceph_syn.cc index db90373fc57..fb5f22f31ca 100644 --- a/src/ceph_syn.cc +++ b/src/ceph_syn.cc @@ -68,8 +68,9 @@ int main(int argc, const char **argv, char *envp[]) cout << "ceph-syn: starting " << g_conf->num_client << " syn client(s)" << std::endl; for (int i=0; i<g_conf->num_client; i++) { - messengers[i] = new SimpleMessenger(g_ceph_context, entity_name_t(entity_name_t::TYPE_CLIENT,-1)); - messengers[i]->set_nonce(i * 1000000 + getpid()); + messengers[i] = new SimpleMessenger(g_ceph_context, + entity_name_t(entity_name_t::TYPE_CLIENT,-1), + i * 1000000 + getpid()); messengers[i]->bind(g_conf->public_addr); mclients[i] = new MonClient(g_ceph_context); mclients[i]->build_initial_monmap(); |