From: Greg Farnum <greg@inktank.com>
Date: Fri, 4 Oct 2013 16:26:02 +0000 (-0700)
Subject: ReplicatedPG: assert that we have succeeded in do_osd_ops on copyfrom repeats
X-Git-Tag: v0.71~22^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=469d471a8b668e4001561898ab9b908aa28477a1;p=ceph.git

ReplicatedPG: assert that we have succeeded in do_osd_ops on copyfrom repeats

Our callback is handling errors on its own at this point.

Signed-off-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index ce5d347cb3bc..8ba4c6cdc9fc 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -3774,10 +3774,8 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
 	  result = -EINPROGRESS;
 	} else {
 	  // finish
-	  result = ctx->copy_cb->get_result();
-	  if (result >= 0) { //success!
-	    result = finish_copyfrom(ctx);
-	  }
+	  assert(ctx->copy_cb->get_result() >= 0);
+	  result = finish_copyfrom(ctx);
 	}
       }
       break;