osd: make PG "deep" state name consistent

Previously the state-to-string path called
deep scrubbing "deep", but the string-to-state
path called it "deep_scrub".  Confusing!  Also
meant that the "pg ls" help output was wrong
because it uses the state-to-string path.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit a8b4d20b700dc905d95f7de9564cb085e067e51b)

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 0fdbb65307c4857a90059857df9d8146fa5597c2..f541af8a0e5c14a582563df904aa30033c8def73 100644 (file)
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -892,7 +892,7 @@ boost::optional<uint64_t> pg_string_state(const std::string& state)
     type = PG_STATE_STALE;
   else if (state == "remapped")
     type = PG_STATE_REMAPPED;
-  else if (state == "deep_scrub")
+  else if (state == "deep")
     type = PG_STATE_DEEP_SCRUB;
   else if (state == "backfilling")
     type = PG_STATE_BACKFILLING;