From: Samuel Just <sam.just@inktank.com>
Date: Sat, 7 Dec 2013 23:10:26 +0000 (-0800)
Subject: ReplicatedPG::finish_copyfrom: check new_obs.exists, not obs.exists
X-Git-Tag: v0.78~286^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e8a08ffa5bfe0331aab9e3dbfdc3a2f41d564a3a;p=ceph.git

ReplicatedPG::finish_copyfrom: check new_obs.exists, not obs.exists

If the transaction previously created the object, the stat update
will have already happened.

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

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 4dc0ee4e8e95..a4c4d2d4d11c 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -5432,7 +5432,7 @@ void ReplicatedPG::finish_copyfrom(OpContext *ctx)
     ctx->op_t->remove(obs.oi.soid);
   }
 
-  if (!ctx->obs->exists) {
+  if (!obs.exists) {
     ctx->delta_stats.num_objects++;
     obs.exists = true;
   }