mon: add a set_recovery_stretch_mode function

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit e1ae9257fbe6c79b757fe4446d9b9e4781045065)

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index f803d7a6c6f28b85da780916c522965b21c7316b..cbec370443a4f9950518bb58099b93a1d5ca15d9 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -6677,8 +6677,14 @@ void Monitor::go_recovery_stretch_mode()
   if (!osdmon()->is_writeable()) {
     osdmon()->wait_for_writeable_ctx(new CMonGoRecovery(this));
   }
+  set_recovery_stretch_mode();
+  osdmon()->trigger_recovery_stretch_mode();
+}
+
+void Monitor::set_recovery_stretch_mode()
+{
+  degraded_stretch_mode = true;
   recovering_stretch_mode = true;
-  osdmon()->trigger_recovery_stretch_mode();  
 }
 
 void Monitor::maybe_go_degraded_stretch_mode()

diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index 729c4f6cebdb9274461480010bc607e9c84eaebe..5a215545cbdc4d5a6e04ae402abc2bda365a2612 100644 (file)
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -272,6 +272,7 @@ public:
                                     const set<int>& dead_buckets);
   void set_degraded_stretch_mode();
   void go_recovery_stretch_mode();
+  void set_recovery_stretch_mode();
   void trigger_healthy_stretch_mode();
   void set_healthy_stretch_mode();
   void enable_stretch_mode();