diff options
| author | Greg Farnum <gregory.farnum@dreamhost.com> | 2012-03-01 17:12:28 -0800 |
|---|---|---|
| committer | Greg Farnum <gregory.farnum@dreamhost.com> | 2012-03-02 11:20:27 -0800 |
| commit | ef244773ee6bd8d1b8c7b0a5a06e9c082eefa472 (patch) | |
| tree | ddf0080687bf0447ab34ed367b64c615b432c376 /src/mds | |
| parent | ffa595598d5b49ac2d30a16e4a2f9ae24e518a33 (diff) | |
| download | ceph-ef244773ee6bd8d1b8c7b0a5a06e9c082eefa472.tar.gz | |
msgr: Remove the SimpleMessenger start/start_with_nonce distinction.
Instead, have a settable nonce value that you can fill in any time
after construction and that it uses during regular start().
Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
Diffstat (limited to 'src/mds')
| -rw-r--r-- | src/mds/Dumper.cc | 2 | ||||
| -rw-r--r-- | src/mds/Resetter.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mds/Dumper.cc b/src/mds/Dumper.cc index 8556696c071..d963c9d567c 100644 --- a/src/mds/Dumper.cc +++ b/src/mds/Dumper.cc @@ -56,7 +56,7 @@ void Dumper::init(int rank) objecter->set_client_incarnation(0); messenger->add_dispatcher_head(this); - messenger->start_with_nonce(getpid()); + messenger->start(); monc->set_want_keys(CEPH_ENTITY_TYPE_MON|CEPH_ENTITY_TYPE_OSD|CEPH_ENTITY_TYPE_MDS); monc->set_messenger(messenger); diff --git a/src/mds/Resetter.cc b/src/mds/Resetter.cc index f5ba3cab40d..63139f56588 100644 --- a/src/mds/Resetter.cc +++ b/src/mds/Resetter.cc @@ -66,7 +66,7 @@ void Resetter::init(int rank) objecter->set_client_incarnation(0); messenger->add_dispatcher_head(this); - messenger->start_with_nonce(getpid()); + messenger->start(); monc->set_want_keys(CEPH_ENTITY_TYPE_MON|CEPH_ENTITY_TYPE_OSD|CEPH_ENTITY_TYPE_MDS); monc->set_messenger(messenger); |