]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG: assert build_push_op succeeds on primary
authorSamuel Just <sam.just@inktank.com>
Tue, 24 Sep 2013 19:33:37 +0000 (12:33 -0700)
committerSamuel Just <sam.just@inktank.com>
Thu, 26 Sep 2013 18:24:28 +0000 (11:24 -0700)
Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/ReplicatedPG.cc

index 449994fadf0751efae7b14f64235f3c07f347d7e..9c9b4fb6bb929e165d0bebb61e07d9c3de739617 100644 (file)
@@ -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 {