diff options
| author | Sage Weil <sage@newdream.net> | 2012-02-13 11:06:34 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2012-02-13 11:06:34 -0800 |
| commit | 389653e63de00f2e3e25a07c7deefaee20fef9d8 (patch) | |
| tree | 08ea06924029d99313b97fb7924739a5bb36a29d /src/messages | |
| parent | b1162a37d8c74d7bd3e712e159cd583744a580d3 (diff) | |
| download | ceph-389653e63de00f2e3e25a07c7deefaee20fef9d8.tar.gz | |
osd: remove peer_stat from MOSDOp entirely
We haven't used this feature for years and years, and don't plan to. It
was there to facilitate "read shedding", where the primary OSD would
forward a read request to a replica. However, replicas can't reply back
to the client in that case because OSDs don't initiate connections (they
used to).
Rip this out for now, especially since osd_peer_stat_t just changed.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'src/messages')
| -rw-r--r-- | src/messages/MOSDOp.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/messages/MOSDOp.h b/src/messages/MOSDOp.h index 418886507ff..07928628b6f 100644 --- a/src/messages/MOSDOp.h +++ b/src/messages/MOSDOp.h @@ -54,7 +54,6 @@ private: snapid_t snap_seq; vector<snapid_t> snaps; - osd_peer_stat_t peer_stat; public: int rmw_flags; @@ -99,15 +98,6 @@ public: bool may_exec() { assert(rmw_flags); return rmw_flags & (CEPH_OSD_FLAG_EXEC | CEPH_OSD_FLAG_EXEC_PUBLIC); } bool require_exec_caps() { assert(rmw_flags); return rmw_flags & CEPH_OSD_FLAG_EXEC; } - void set_peer_stat(const osd_peer_stat_t& st) { - peer_stat = st; - flags |= CEPH_OSD_FLAG_PEERSTAT; - } - const osd_peer_stat_t& get_peer_stat() { - assert(flags & CEPH_OSD_FLAG_PEERSTAT); - return peer_stat; - } - MOSDOp() : Message(CEPH_MSG_OSD_OP, HEAD_VERSION, COMPAT_VERSION) { } MOSDOp(int inc, long tid, @@ -249,8 +239,6 @@ struct ceph_osd_request_head { ::encode_nohead(oid.name, payload); ::encode_nohead(snaps, payload); - if (flags & CEPH_OSD_FLAG_PEERSTAT) - ::encode(peer_stat, payload); } else { ::encode(client_inc, payload); ::encode(osdmap_epoch, payload); @@ -271,9 +259,6 @@ struct ceph_osd_request_head { ::encode(snap_seq, payload); ::encode(snaps, payload); - if (flags & CEPH_OSD_FLAG_PEERSTAT) - ::encode(peer_stat, payload); - ::encode(retry_attempt, payload); } } @@ -315,9 +300,6 @@ struct ceph_osd_request_head { decode_nohead(oid_len, oid.name, p); decode_nohead(num_snaps, snaps, p); - if (flags & CEPH_OSD_FLAG_PEERSTAT) - ::decode(peer_stat, p); - // recalculate pgid hash value pgid.set_ps(ceph_str_hash(CEPH_STR_HASH_RJENKINS, oid.name.c_str(), @@ -355,9 +337,6 @@ struct ceph_osd_request_head { ::decode(snap_seq, p); ::decode(snaps, p); - if (flags & CEPH_OSD_FLAG_PEERSTAT) - ::decode(peer_stat, p); - if (header.version >= 4) ::decode(retry_attempt, p); else |