From: Sage Weil <sage@newdream.net>
Date: Fri, 17 Dec 2010 18:36:34 +0000 (-0800)
Subject: osd: add assert that we're replica
X-Git-Tag: v0.24~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b190875548347a45399ec2693a59b620d498a353;p=ceph.git

osd: add assert that we're replica

ar Fred saw a crash where we got into merge_log as a stray, which really
shouldn't ever happen!  See #590.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 5b260dd93a6d..2d09a18815e9 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3985,6 +3985,7 @@ void OSD::_process_pg_info(epoch_t epoch, int from,
       pg->activate(*t, fin->contexts, info_map);
     } else {
       // ACTIVE REPLICA
+      assert(pg->is_replica());
 
       // just update our stats
       dout(10) << *pg << " writing updated stats" << dendl;