]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PGBackend: ignore temp objects in objects_list_*
authorSage Weil <sage@redhat.com>
Thu, 23 Apr 2015 20:13:40 +0000 (13:13 -0700)
committerSage Weil <sage@redhat.com>
Fri, 19 Jun 2015 00:02:49 +0000 (17:02 -0700)
These were implicitly ignored before when temp objects were in a
different collection.

Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/PGBackend.cc

index aa27af0546eb396b3d38a30f940968408ae652dc..4ea47583d1061ef8834000b33fe7fa13b449958e 100644 (file)
@@ -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()) {