summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-07-25 13:15:11 -0700
committerSage Weil <sage@newdream.net>2011-07-25 13:16:34 -0700
commita6d9d633d731de0ceca549087dc6896d5eba28da (patch)
tree73555270f1d0ac98cfbfc0d75dc25c616b31f7e3
parent105a9914682ca53c68d749f2af1b45e5d0294dd8 (diff)
downloadceph-a6d9d633d731de0ceca549087dc6896d5eba28da.tar.gz
objecter: treat RESETSESSION like a reset
Commit 065cdf5 rewrote ms_handle_reset but didn't adjust ms_handle_remote_reset (they used to be identical). The result is lost MOSDOps if the osd ever sends a RESETSESSION. Signed-off-by: Sage Weil <sage@newdream.net>
-rw-r--r--src/osdc/Objecter.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index ccf1cdfef63..25e90351efe 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -1382,8 +1382,10 @@ void Objecter::ms_handle_reset(Connection *con)
void Objecter::ms_handle_remote_reset(Connection *con)
{
- if (con->get_peer_type() == CEPH_ENTITY_TYPE_OSD)
- maybe_request_map();
+ /*
+ * treat these the same.
+ */
+ ms_handle_reset(con);
}