From: Sage Weil <sage@newdream.net>
Date: Mon, 25 Jul 2011 20:15:11 +0000 (-0700)
Subject: objecter: treat RESETSESSION like a reset
X-Git-Tag: v0.32~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a6d9d633d731de0ceca549087dc6896d5eba28da;p=ceph.git

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>
---

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);
 }