From 02d4640150c691ff0d07765d190155c81170835b Mon Sep 17 00:00:00 2001
From: Greg Farnum <gregf@hq.newdream.net>
Date: Wed, 24 Nov 2010 13:28:49 -0800
Subject: [PATCH] mds: rename is_standby_replay() to is_oneshot_replay. This
 better represents its current purpose.

---
 src/mds/MDS.cc | 8 ++++----
 src/mds/MDS.h  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 5423ece9174d6..3fd5171331ed0 100644
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -897,7 +897,7 @@ void MDS::handle_mds_map(MMDSMap *m)
 
     if (is_active()) {
       active_start();
-    } else if (is_replay() || is_standby_replay()) {
+    } else if (is_replay() || is_oneshot_replay()) {
       replay_start();
     } else if (is_resolve()) {
       resolve_start();
@@ -1130,7 +1130,7 @@ void MDS::boot_start(int step, int r)
     }
 
   case 3:
-    if (is_replay() || is_standby_replay()) {
+    if (is_replay() || is_oneshot_replay()) {
       dout(2) << "boot_start " << step << ": replaying mds log" << dendl;
       mdlog->replay(new C_MDS_BootStart(this, 4));
       break;
@@ -1141,7 +1141,7 @@ void MDS::boot_start(int step, int r)
     }
 
   case 4:
-    if (is_replay() || is_standby_replay()) {
+    if (is_replay() || is_oneshot_replay()) {
       replay_done();
       break;
     }
@@ -1202,7 +1202,7 @@ void MDS::replay_done()
 	  << " failed=" << mdsmap->get_num_failed()
 	  << dendl;
 
-  if (is_standby_replay()) {
+  if (is_oneshot_replay()) {
     dout(2) << "hack.  journal looks ok.  shutting down." << dendl;
     suicide();
     return;
diff --git a/src/mds/MDS.h b/src/mds/MDS.h
index 74fc9db0e2329..1df0b998d40d3 100644
--- a/src/mds/MDS.h
+++ b/src/mds/MDS.h
@@ -225,7 +225,7 @@ class MDS : public Dispatcher {
   bool is_active()   { return state == MDSMap::STATE_ACTIVE; }
   bool is_stopping() { return state == MDSMap::STATE_STOPPING; }
 
-  bool is_standby_replay()   { return state == MDSMap::STATE_ONESHOT_REPLAY; }
+  bool is_oneshot_replay()   { return state == MDSMap::STATE_ONESHOT_REPLAY; }
 
   bool is_stopped()  { return mdsmap->is_stopped(whoami); }
 
-- 
2.39.5