From: Samuel Just <sam.just@inktank.com>
Date: Sun, 20 Apr 2014 23:45:12 +0000 (-0700)
Subject: PG::PriorSet: consider lost osds in up_now for pcontdec
X-Git-Tag: v0.80~23^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8620bd2f5d87e20f88791cae609601e225e6e010;p=ceph.git

PG::PriorSet: consider lost osds in up_now for pcontdec

Otherwise, the pg will remain down even as osds are marked lost.

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 7dd0acae8c2b..55d75acad027 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -7375,6 +7375,7 @@ PG::PriorSet::PriorSet(bool ec_pool,
 	down.insert(o);
       } else if (pinfo->lost_at > interval.first) {
 	dout(10) << "build_prior  prior osd." << o << " is down, but lost_at " << pinfo->lost_at << dendl;
+	up_now.insert(so);
 	down.insert(o);
       } else {
 	dout(10) << "build_prior  prior osd." << o << " is down" << dendl;