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 413ad594c4f304e055cadfde954180ae76e422cf..8362f99b7b4357b9f516169f90130b6e096fdab4 100644 (file)
--- 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;