From: David Zafman <dzafman@redhat.com>
Date: Fri, 18 Dec 2015 17:08:19 +0000 (-0800)
Subject: osd/OSD: clear_temp_objects() include removal of Hammer temp objects
X-Git-Tag: v9.2.1~20^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2480fca93beb700aa9a963f5b568ab6bf8915e0f;p=ceph.git

osd/OSD: clear_temp_objects() include removal of Hammer temp objects

Fixes: #13862

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 10b4a0825d9917b6fdd0d6450640238b78ba05d4)
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 413ad594c4f3..8362f99b7b43 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2508,7 +2508,8 @@ void OSD::clear_temp_objects()
 	break;
       vector<ghobject_t>::iterator q;
       for (q = objects.begin(); q != objects.end(); ++q) {
-	if (q->hobj.is_temp()) {
+	// Hammer set pool for temps to -1, so check for clean-up
+	if (q->hobj.is_temp() || (q->hobj.pool == -1)) {
 	  temps.push_back(*q);
 	} else {
 	  break;