import 15.2.0 Octopus source

[ceph.git] / ceph / doc / dev / osd_internals / pg.rst

diff --git a/ceph/doc/dev/osd_internals/pg.rst b/ceph/doc/dev/osd_internals/pg.rst
index 405536396f1dfed5b9d3b740c69202ce6951d1a9..397d4ab5d4fad6412d172808207f9c10481f5097 100644 (file)
--- a/ceph/doc/dev/osd_internals/pg.rst
+++ b/ceph/doc/dev/osd_internals/pg.rst
@@ -8,12 +8,12 @@ Concepts
 *Peering Interval*
   See PG::start_peering_interval.
   See PG::acting_up_affected
-  See PG::RecoveryState::Reset
+  See PG::PeeringState::Reset
 
   A peering interval is a maximal set of contiguous map epochs in which the
-  up and acting sets did not change.  PG::RecoveryMachine represents a 
+  up and acting sets did not change.  PG::PeeringMachine represents a
   transition from one interval to another as passing through
-  RecoveryState::Reset.  On PG::RecoveryState::AdvMap PG::acting_up_affected can
+  PeeringState::Reset.  On PG::PeeringState::AdvMap PG::acting_up_affected can
   cause the pg to transition to Reset.
   
 
@@ -22,10 +22,10 @@ Peering Details and Gotchas
 For an overview of peering, see `Peering <../../peering>`_.
 
   * PG::flushed defaults to false and is set to false in
-    PG::start_peering_interval.  Upon transitioning to PG::RecoveryState::Started
+    PG::start_peering_interval.  Upon transitioning to PG::PeeringState::Started
     we send a transaction through the pg op sequencer which, upon complete,
     sends a FlushedEvt which sets flushed to true.  The primary cannot go
-    active until this happens (See PG::RecoveryState::WaitFlushedPeering).
+    active until this happens (See PG::PeeringState::WaitFlushedPeering).
     Replicas can go active but cannot serve ops (writes or reads).
     This is necessary because we cannot read our ondisk state until unstable
     transactions from the previous interval have cleared.