From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Mon, 29 Nov 2010 17:29:17 +0000 (-0800)
Subject: osd: _process_pg_info: add assert for replicas
X-Git-Tag: v0.24~109
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=756918be3b24d8164699da301ddfbc8e6fd6b751;p=ceph.git

osd: _process_pg_info: add assert for replicas

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 3598b4250edc..f2474e82c6a1 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3943,6 +3943,11 @@ void OSD::_process_pg_info(epoch_t epoch, int from,
       // INACTIVE REPLICA
       assert(from == pg->acting[0]);
       pg->merge_log(*t, info, log, from);
+
+      // We should have the right logs before activating.
+      assert(pg->log.tail <= pg->info.last_complete);
+      assert(pg->log.head == pg->info.last_update);
+
       pg->activate(*t, fin->contexts, info_map);
     } else {
       // ACTIVE REPLICA