From: Sage Weil <sage@redhat.com>
Date: Thu, 23 Apr 2015 20:13:40 +0000 (-0700)
Subject: osd/PGBackend: ignore temp objects in objects_list_*
X-Git-Tag: v9.0.3~52^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a965d6ad0fab415abe3600a836a3531d04eb25f;p=ceph.git

osd/PGBackend: ignore temp objects in objects_list_*

These were implicitly ignored before when temp objects were in a
different collection.

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

diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
index aa27af0546e..4ea47583d10 100644
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -127,7 +127,7 @@ int PGBackend::objects_list_partial(
     for (vector<ghobject_t>::iterator i = objects.begin();
 	 i != objects.end();
 	 ++i) {
-      if (i->is_pgmeta()) {
+      if (i->is_pgmeta() || i->hobj.is_temp()) {
 	continue;
       }
       if (i->is_no_gen()) {
@@ -159,7 +159,7 @@ int PGBackend::objects_list_range(
   for (vector<ghobject_t>::iterator i = objects.begin();
        i != objects.end();
        ++i) {
-    if (i->is_pgmeta()) {
+    if (i->is_pgmeta() || i->hobj.is_temp()) {
       continue;
     }
     if (i->is_no_gen()) {