mon: rename maybe_engage_stretch_mode to try_engage_stretch_mode

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 5f0584bb14fecbe4ee32841ce9eff191b2a2d415..f803d7a6c6f28b85da780916c522965b21c7316b 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -6549,7 +6549,7 @@ void Monitor::notify_new_monmap(bool can_change_external_state)
   }
 
   if (monmap->stretch_mode_enabled) {
-    maybe_engage_stretch_mode();
+    try_engage_stretch_mode();
   }
 
   if (is_stretch_mode()) {
@@ -6583,10 +6583,10 @@ struct CMonEnableStretchMode : public Context {
   Monitor *m;
   CMonEnableStretchMode(Monitor *mon) : m(mon) {}
   void finish(int r) {
-    m->maybe_engage_stretch_mode();
+    m->try_engage_stretch_mode();
   }
 };
-void Monitor::maybe_engage_stretch_mode()
+void Monitor::try_engage_stretch_mode()
 {
   dout(20) << __func__ << dendl;
   if (stretch_mode_engaged) return;

diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index d5751cc9d366eb64b6ab96a93891ae46c904d54f..729c4f6cebdb9274461480010bc607e9c84eaebe 100644 (file)
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -266,7 +266,7 @@ public:
   bool is_stretch_mode() { return stretch_mode_engaged; }
   bool is_degraded_stretch_mode() { return degraded_stretch_mode; }
   bool is_recovering_stretch_mode() { return recovering_stretch_mode; }
-  void maybe_engage_stretch_mode();
+  void try_engage_stretch_mode();
   void maybe_go_degraded_stretch_mode();
   void trigger_degraded_stretch_mode(const set<string>& dead_mons,
                                     const set<int>& dead_buckets);

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index c4707101b69fa3a4ead156a8cff9d18da82f0875..a48c07a872e22a10a74bf619e054c09bba77a69d 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -945,7 +945,7 @@ void OSDMonitor::update_from_paxos(bool *need_bootstrap)
   }
   if (osdmap.stretch_mode_enabled) {
     dout(20) << "Stretch mode enabled in this map" << dendl;
-    mon.maybe_engage_stretch_mode();
+    mon.try_engage_stretch_mode();
     if (osdmap.degraded_stretch_mode) {
       dout(20) << "Degraded stretch mode set in this map" << dendl;
       if (!osdmap.recovering_stretch_mode) {