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/libcephfs.cc | |
| 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/libcephfs.cc')
| -rw-r--r-- | src/libcephfs.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libcephfs.cc b/src/libcephfs.cc index 4ce2f1a0350..377ab45db40 100644 --- a/src/libcephfs.cc +++ b/src/libcephfs.cc @@ -78,6 +78,7 @@ public: //network connection messenger = new SimpleMessenger(cct, entity_name_t::CLIENT()); + messenger->set_nonce(msgr_nonce); //at last the client ret = -1002; @@ -86,7 +87,7 @@ public: goto fail; ret = -1003; - if (messenger->start_with_nonce(msgr_nonce) != 0) + if (messenger->start() != 0) goto fail; ret = client->init(); |