From: Sage Weil <sage@newdream.net>
Date: Thu, 10 Dec 2009 18:03:44 +0000 (-0800)
Subject: mon: log error, don't abort, on stray pg_stat notify
X-Git-Tag: v0.19~274
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1eabf8d18803816c6076fcf5ddcd25346f8caf9c;p=ceph.git

mon: log error, don't abort, on stray pg_stat notify
---

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index ca60f0ebe4b6..3a026039139b 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -362,7 +362,10 @@ bool PGMonitor::prepare_pg_stats(MPGStats *stats)
 	       << " state " << pg_state_string(p->second.state)
 	       << " but DNE in pg_map!!"
 	       << dendl;
-      assert(0);
+      stringstream ss;
+      ss << "got " << pgid << " pg_stat from osd" << from << " but dne in pg_map";
+      mon->logclient.log(LOG_ERROR, ss);
+      continue;
     }
       
     dout(15) << " got " << pgid