From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Tue, 4 Sep 2018 07:34:24 +0000 (+0800)
Subject: osd/PG: fix misused FORCE_RECOVERY[BACKFILL] flags
X-Git-Tag: v12.2.12~40^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f1403e9273873eb2a763a843ea0c63d37e741d86;p=ceph.git

osd/PG: fix misused FORCE_RECOVERY[BACKFILL] flags

__set_force_backfill__ should set PG_STATE_FORCED_BACKFILL
instead of PG_STATE_FORCED_RECOVERY.

Fixes: http://tracker.ceph.com/issues/27985
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 60ef742a84d5201b2a6e6c1780741da0b31c49a8)

Conflicts:
	src/osd/PG.cc (trivial)
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 3833952611c..f39e4da44e2 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -2164,18 +2164,18 @@ bool PG::set_force_backfill(bool b)
   lock();
   if (!deleting) {
     if (b) {
-      if (!(state & PG_STATE_FORCED_RECOVERY) &&
+      if (!(state & PG_STATE_FORCED_BACKFILL) &&
 	  (state & (PG_STATE_DEGRADED |
 		    PG_STATE_BACKFILL_WAIT |
 		    PG_STATE_BACKFILLING))) {
 	dout(10) << __func__ << " set" << dendl;
-	state_set(PG_STATE_FORCED_RECOVERY);
+	state_set(PG_STATE_FORCED_BACKFILL);
 	publish_stats_to_osd();
 	did = true;
       }
-    } else if (state & PG_STATE_FORCED_RECOVERY) {
+    } else if (state & PG_STATE_FORCED_BACKFILL) {
       dout(10) << __func__ << " clear" << dendl;
-      state_clear(PG_STATE_FORCED_RECOVERY);
+      state_clear(PG_STATE_FORCED_BACKFILL);
       publish_stats_to_osd();
       did = true;
     }