From: Samuel Just <sam.just@inktank.com>
Date: Sat, 8 Feb 2014 19:24:37 +0000 (-0800)
Subject: ReplicatedPG: handle xattr cache on rollback and delete_head
X-Git-Tag: v0.78~163^2~53
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b3b2bab403e37cf81b771fb3c9d50e3bd07c1d0e;p=ceph.git

ReplicatedPG: handle xattr cache on rollback and delete_head

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 3aa466437c62a..7ca0afb5136c4 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -4393,6 +4393,7 @@ inline int ReplicatedPG::_delete_head(OpContext *ctx, bool no_whiteout)
     } else {
       t->remove(soid);
     }
+    ctx->obc->attr_cache.clear();
   } else {
     ctx->mod_desc.mark_unrollbackable();
     t->remove(soid);
@@ -4501,6 +4502,7 @@ int ReplicatedPG::_rollback_to(OpContext *ctx, ceph_osd_op& op)
 	    t->remove(soid);
 	  }
 	}
+	ctx->obc->attr_cache = rollback_to->attr_cache;
       } else {
 	if (obs.exists) {
 	  ctx->mod_desc.mark_unrollbackable();