PGBackend: rename clear_state to clear_recovery_state

This is called when we complete recovery, and does not clear
all state.  clear_recovery_state is clearer.

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
index ee994b666846804b045527c8a1dbc64236e50a4e..a8c75c5de1cbe07c5f51e7b6ed362afa873694e1 100644 (file)
--- a/src/osd/ECBackend.cc
+++ b/src/osd/ECBackend.cc
@@ -1156,10 +1156,10 @@ void ECBackend::on_change()
   }
   in_progress_client_reads.clear();
   shard_to_read_map.clear();
-  clear_state();
+  clear_recovery_state();
 }
 
-void ECBackend::clear_state()
+void ECBackend::clear_recovery_state()
 {
   recovery_ops.clear();
 }

diff --git a/src/osd/ECBackend.h b/src/osd/ECBackend.h
index 04e9beb6124c3e6d77debccbaecd3d8143edf468..d7e6fbdac590db0cd49ad9eec2c325c440f09935 100644 (file)
--- a/src/osd/ECBackend.h
+++ b/src/osd/ECBackend.h
@@ -83,7 +83,7 @@ public:
   void check_recovery_sources(const OSDMapRef osdmap);
 
   void on_change();
-  void clear_state();
+  void clear_recovery_state();
 
   void on_flushed();
 

diff --git a/src/osd/PGBackend.h b/src/osd/PGBackend.h
index 528a59e127f2416153deb0fa25d694cfaffb78ea..91b4d105fca6c29abfa75e0b1db400c40855b080 100644 (file)
--- a/src/osd/PGBackend.h
+++ b/src/osd/PGBackend.h
@@ -314,7 +314,7 @@
     * won't be called after on_change()
     */
    virtual void on_change() = 0;
-   virtual void clear_state() = 0;
+   virtual void clear_recovery_state() = 0;
 
    virtual void on_flushed() = 0;
 

diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc
index 5e29c6e4bc6e9f6923a3026dc7c830966df0530d..486f07994a4a277d96dff9c8aa2847bfe9829a0d 100644 (file)
--- a/src/osd/ReplicatedBackend.cc
+++ b/src/osd/ReplicatedBackend.cc
@@ -199,7 +199,7 @@ bool ReplicatedBackend::handle_message(
   return false;
 }
 
-void ReplicatedBackend::clear_state()
+void ReplicatedBackend::clear_recovery_state()
 {
   // clear pushing/pulling maps
   pushing.clear();
@@ -218,7 +218,7 @@ void ReplicatedBackend::on_change()
     if (i->second.on_applied)
       delete i->second.on_applied;
   }
-  clear_state();
+  clear_recovery_state();
 }
 
 void ReplicatedBackend::on_flushed()

diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h
index 7ce90da1e500d57cc0ef80fa5e527562884735c5..5ad22bfc0b22d4d02d879aa4690d9ad842b0b409 100644 (file)
--- a/src/osd/ReplicatedBackend.h
+++ b/src/osd/ReplicatedBackend.h
@@ -70,7 +70,7 @@ public:
     );
 
   void on_change();
-  void clear_state();
+  void clear_recovery_state();
   void on_flushed();
 
   class RPCRecPred : public IsRecoverablePredicate {

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index ae2339abd31b9c8073e22707c87d4c66223b172a..f0860e6608d5ec7c86f3bacfa2ef05d139fd9399 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -10393,7 +10393,7 @@ void ReplicatedPG::_clear_recovery_state()
   assert(backfills_in_flight.empty());
   pending_backfill_updates.clear();
   recovering.clear();
-  pgbackend->clear_state();
+  pgbackend->clear_recovery_state();
 }
 
 void ReplicatedPG::cancel_pull(const hobject_t &soid)