diff options
| author | Greg Farnum <greg@inktank.com> | 2013-10-04 09:26:02 -0700 |
|---|---|---|
| committer | Greg Farnum <greg@inktank.com> | 2013-10-04 12:59:05 -0700 |
| commit | 469d471a8b668e4001561898ab9b908aa28477a1 (patch) | |
| tree | 82fe6b0d66d9386a5428ec1581fda7a37cef0e8d | |
| parent | f3733a205238516ec2c20f24f61aa0366bac78e5 (diff) | |
| download | ceph-469d471a8b668e4001561898ab9b908aa28477a1.tar.gz | |
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>
| -rw-r--r-- | src/osd/ReplicatedPG.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index ce5d347cb3b..8ba4c6cdc9f 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; |