summaryrefslogtreecommitdiff
path: root/src/osd/OSD.h
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-05-21 16:43:24 -0700
committerSage Weil <sage@inktank.com>2013-05-22 16:11:17 -0700
commitda1940a21c943abd706b09ad4931c0f1edfec147 (patch)
tree8899b003ac56efb1f515729ff6c77592c4867488 /src/osd/OSD.h
parent1fee4ccd5277b52292e255daf458330eef5f0255 (diff)
downloadceph-da1940a21c943abd706b09ad4931c0f1edfec147.tar.gz
osd: create front and back hb messenger instances
The hb_front messenger is not used yet. Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'src/osd/OSD.h')
-rw-r--r--src/osd/OSD.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index bc6ae94f15e..b26e0598f4c 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -715,7 +715,9 @@ private:
epoch_t heartbeat_epoch; ///< last epoch we updated our heartbeat peers
map<int,HeartbeatInfo> heartbeat_peers; ///< map of osd id to HeartbeatInfo
utime_t last_mon_heartbeat;
- Messenger *hbclient_messenger, *hbserver_messenger;
+ Messenger *hbclient_messenger;
+ Messenger *hb_front_server_messenger;
+ Messenger *hb_back_server_messenger;
void _add_heartbeat_peer(int p);
bool heartbeat_reset(Connection *con);
@@ -1568,7 +1570,8 @@ protected:
public:
/* internal and external can point to the same messenger, they will still
* be cleaned up properly*/
- OSD(int id, Messenger *internal, Messenger *external, Messenger *hbmin, Messenger *hbmout,
+ OSD(int id, Messenger *internal, Messenger *external,
+ Messenger *hb_client, Messenger *hb_front_server, Messenger *hb_back_server,
MonClient *mc, const std::string &dev, const std::string &jdev);
~OSD();