From: Sage Weil <sage@redhat.com>
Date: Fri, 21 Nov 2014 05:16:50 +0000 (-0800)
Subject: osd: skip pgmeta object on remove_dir
X-Git-Tag: v0.91~23^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4d22adf6768d221d049a15a51a12e7e4c85837ad;p=ceph.git

osd: skip pgmeta object on remove_dir

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 339c5c64e08..bd4d3374aa7 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -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) {