diff options
| author | Samuel Just <sam.just@inktank.com> | 2013-09-24 12:33:37 -0700 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2013-09-26 11:24:28 -0700 |
| commit | 2bc1e38c1c46be9575f06bd1a19c1675aa1821f8 (patch) | |
| tree | 0d16aaf3fb29a197f99e1fdaedea839ca5ed0aca | |
| parent | aeadecda0e140f0162a885e4da2f862ef1b66b1b (diff) | |
| download | ceph-2bc1e38c1c46be9575f06bd1a19c1675aa1821f8.tar.gz | |
ReplicatedPG: assert build_push_op succeeds on primary
Signed-off-by: Samuel Just <sam.just@inktank.com>
| -rw-r--r-- | src/osd/ReplicatedPG.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 449994fadf0..9c9b4fb6bb9 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -6180,11 +6180,12 @@ void ReplicatedBackend::prep_push( pi.recovery_progress.omap_complete = 0; ObjectRecoveryProgress new_progress; - build_push_op(pi.recovery_info, - pi.recovery_progress, - &new_progress, - pop, - &(pi.stat)); + int r = build_push_op(pi.recovery_info, + pi.recovery_progress, + &new_progress, + pop, + &(pi.stat)); + assert(r == 0); pi.recovery_progress = new_progress; } @@ -6710,10 +6711,11 @@ bool ReplicatedBackend::handle_push_reply(int peer, PushReplyOp &op, PushOp *rep << pi->recovery_progress.data_recovered_to << " of " << pi->recovery_info.copy_subset << dendl; ObjectRecoveryProgress new_progress; - build_push_op( + int r = build_push_op( pi->recovery_info, pi->recovery_progress, &new_progress, reply, &(pi->stat)); + assert(r == 0); pi->recovery_progress = new_progress; return true; } else { |