]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: skip pgmeta object on remove_dir
authorSage Weil <sage@redhat.com>
Fri, 21 Nov 2014 05:16:50 +0000 (21:16 -0800)
committerSage Weil <sage@redhat.com>
Wed, 17 Dec 2014 01:07:55 +0000 (17:07 -0800)
Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/OSD.cc

index 339c5c64e085d3f6e7a3ede889abcc7ca9c3fcd3..bd4d3374aa7f75fb7269c83047f8761a19b85cd6 100644 (file)
@@ -4092,6 +4092,8 @@ bool remove_dir(
     for (vector<ghobject_t>::iterator i = olist.begin();
         i != olist.end();
         ++i, ++num) {
+      if (i->is_pgmeta())
+       continue;
       OSDriver::OSTransaction _t(osdriver->get_transaction(t));
       int r = mapper->remove_oid(i->hobj, &_t);
       if (r != 0 && r != -ENOENT) {