diff options
| author | Sage Weil <sage@inktank.com> | 2012-11-05 06:36:28 -0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-11-30 13:18:02 -0800 |
| commit | e42ed659b9b1d161f14a5edfbcdb4e0ca509f95b (patch) | |
| tree | a58861d172f7adc5f8524db8c113a07ee0c4bc20 | |
| parent | 4940dac7e20ff3adc31144564d858439bfb46e11 (diff) | |
| download | ceph-e42ed659b9b1d161f14a5edfbcdb4e0ca509f95b.tar.gz | |
osd: HeartbeatSession -> HeartbeatClientSession
This session is associated with the client-side (outing ping request)
Connections.
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/osd/OSD.cc | 4 | ||||
| -rw-r--r-- | src/osd/OSD.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index aa7f9c4e447..d6ea0bc8da5 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -1795,7 +1795,7 @@ void OSD::_add_heartbeat_peer(int p) hi->con = con.get(); hi->con->get(); hi->peer = p; - hi->con->set_priv(new HeartbeatSession(p)); + hi->con->set_priv(new HeartbeatClientSession(p)); dout(10) << "_add_heartbeat_peer: new peer osd." << p << " " << hi->con->get_peer_addr() << dendl; } else { @@ -2087,7 +2087,7 @@ void OSD::heartbeat() bool OSD::heartbeat_reset(Connection *con) { - HeartbeatSession *s = (HeartbeatSession*)con->get_priv(); + HeartbeatClientSession *s = (HeartbeatClientSession*)con->get_priv(); if (s) { heartbeat_lock.Lock(); map<int,HeartbeatInfo>::iterator p = heartbeat_peers.find(s->peer); diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 662b023c8fc..cf55328d584 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -511,9 +511,9 @@ private: epoch_t epoch; ///< most recent epoch we wanted this peer }; /// state attached to outgoing heartbeat connections - struct HeartbeatSession : public RefCountedObject { + struct HeartbeatClientSession : public RefCountedObject { int peer; - HeartbeatSession(int p) : peer(p) {} + HeartbeatClientSession(int p) : peer(p) {} }; Mutex heartbeat_lock; map<int, int> debug_heartbeat_drops_remaining; |