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

Fixes: #13862
Signed-off-by: David Zafman <dzafman@redhat.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 1d0ca9c57f21e0dcaa17f6742506227b359ef3f7..5bb26d19b85c2a1759f0af219b7605099d013a5b 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2571,7 +2571,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;