From: Sage Weil <sage@redhat.com>
Date: Mon, 2 Apr 2018 13:50:07 +0000 (-0500)
Subject: osd: fix 'stale' message
X-Git-Tag: v13.1.0~390^2~20
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=dc66a055ead6bd55c1108b65c003627ce8296ec2;p=ceph.git

osd: fix 'stale' message

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index d4daac5a08523..ea3f64df1290d 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -9416,8 +9416,11 @@ void OSDShard::consume_map(
 		 << " waiting item " << qi
 		 << " epoch " << qi.get_map_epoch()
 		 << " <= " << osdmap->get_epoch()
-		 << ", stale, dropping" << dendl;
-	*pushes_to_free += qi.get_reserved_pushes();
+		 << ", "
+		 << (qi.get_map_epoch() < osdmap->get_epoch() ? "stale" :
+		     "misdirected")
+		 << ", dropping" << dendl;
+        *pushes_to_free += qi.get_reserved_pushes();
 	slot->waiting.pop_front();
       }
       if (slot->waiting.empty() &&