From: xie xingguo Date: Tue, 31 May 2016 11:37:09 +0000 (+0800) Subject: osd: rename "wait_backfill" to "backfill_wait" X-Git-Tag: v11.0.1~866^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fbfd38c475eb7ee67826f5bd29e2e540ca3365b9;p=ceph.git osd: rename "wait_backfill" to "backfill_wait" We use "backfill_wait" everywhere except this one. Signed-off-by: xie xingguo --- diff --git a/doc/dev/osd_internals/recovery_reservation.rst b/doc/dev/osd_internals/recovery_reservation.rst index edbf4c9fa676d..24db1387f50de 100644 --- 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 9ccdf672db2a0..0a5b8f92fafde 100644 --- 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)