Merge branch 'osd-op-create' of git://github.com/majianpeng/ceph

Conflicts: src/osd/ReplicatedPG.cc Reviewed-by: Sage Weil <[email protected]>
areed · Nov 20, 2015 · 28c0f8f · 28c0f8f
2 parents b584388 + d6b30de
commit 28c0f8f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
@@ -4940,9 +4940,13 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
 	    // category is no longer implemented.
 	  }
           if (result >= 0) {
+	    bool is_whiteout = obs.exists && oi.is_whiteout();
 	    if (maybe_create_new_object(ctx)) {
-              ctx->mod_desc.create();
+	      ctx->mod_desc.create();
 	      t->touch(soid);
+	    } else if (is_whiteout) {
+	      // to change whiteout to non-whiteout, it need an op to update xattr
+	      t->nop();
 	    }
           }
 	}