]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: add assert to _process_pg_info
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Tue, 23 Nov 2010 01:37:55 +0000 (17:37 -0800)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Tue, 23 Nov 2010 01:37:55 +0000 (17:37 -0800)
When activating an inactive replica, assert that we are doing so based
on a message from the primary.

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
src/osd/OSD.cc

index 05704f5e608cb516601e951bb30c3f2f9902520f..8b80b3dc04891fedb1e19b77509dd3500faf9062 100644 (file)
@@ -3933,6 +3933,7 @@ void OSD::_process_pg_info(epoch_t epoch, int from,
   } else if (!pg->info.dne()) {
     if (!pg->is_active()) {
       // INACTIVE REPLICA
+      assert(from == pg->acting[0]);
       pg->merge_log(*t, info, log, from);
       pg->activate(*t, fin->contexts, info_map);
     } else {