osd: rename "wait_backfill" to "backfill_wait"

We use "backfill_wait" everywhere except this one.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

diff --git a/doc/dev/osd_internals/recovery_reservation.rst b/doc/dev/osd_internals/recovery_reservation.rst
index edbf4c9fa676d8a3145ed6ed7fa6bf330c1ff708..24db1387f50de2ae67e95aed449a07f239802c9e 100644 (file)
--- a/doc/dev/osd_internals/recovery_reservation.rst
+++ b/doc/dev/osd_internals/recovery_reservation.rst
@@ -62,7 +62,7 @@ to the monitor. The state chart can set:
 
  - recovery_wait: waiting for local/remote reservations
  - recovering: recovering
- - wait_backfill: waiting for remote backfill reservations
+ - backfill_wait: waiting for remote backfill reservations
  - backfilling: backfilling
  - backfill_toofull: backfill reservation rejected, OSD too full
 

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 9ccdf672db2a0eb6e980ab1e7eeed05fedf09357..0a5b8f92fafdeae0927c7365738c443575e6488f 100644 (file)
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -824,7 +824,7 @@ std::string pg_state_string(int state)
     oss << "repair+";
   if ((state & PG_STATE_BACKFILL_WAIT) &&
       !(state &PG_STATE_BACKFILL))
-    oss << "wait_backfill+";
+    oss << "backfill_wait+";
   if (state & PG_STATE_BACKFILL)
     oss << "backfilling+";
   if (state & PG_STATE_BACKFILL_TOOFULL)