From 879ce01a111ce877d40d09eee8784b2fbbf3138d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 12 Sep 2012 17:46:17 -0700 Subject: [PATCH] mon: move setting of ondisk GV feature into helper Signed-off-by: Sage Weil --- src/mon/Monitor.cc | 15 +++++++++------ src/mon/Monitor.h | 2 ++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 6f69be84bfa30..2c7bb8af8dcad 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -215,9 +215,7 @@ void Monitor::recovered_leader(int id) if (!features.incompat.contains(CEPH_MON_FEATURE_INCOMPAT_GV) && (quorum_features & CEPH_FEATURE_MON_GV)) { - dout(0) << "setting CEPH_MON_FEATURE_INCOMPAT_GV" << dendl; - features.incompat.insert(CEPH_MON_FEATURE_INCOMPAT_GV); - write_features(); + require_gv_ondisk(); } for (vector::iterator p = paxos.begin(); p != paxos.end(); p++) @@ -241,14 +239,19 @@ void Monitor::recovered_peon(int id) if (!features.incompat.contains(CEPH_MON_FEATURE_INCOMPAT_GV) && (quorum_features & CEPH_FEATURE_MON_GV)) { - dout(0) << "setting CEPH_MON_FEATURE_INCOMPAT_GV" << dendl; - features.incompat.insert(CEPH_MON_FEATURE_INCOMPAT_GV); - write_features(); + require_gv_ondisk(); } } } +void Monitor::require_gv_ondisk() +{ + dout(0) << "setting CEPH_MON_FEATURE_INCOMPAT_GV" << dendl; + features.incompat.insert(CEPH_MON_FEATURE_INCOMPAT_GV); + write_features(); +} + version_t Monitor::get_global_paxos_version() { // this should only be called when paxos becomes writeable, which is diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h index fd45432f04fab..a7513670e2e2b 100644 --- a/src/mon/Monitor.h +++ b/src/mon/Monitor.h @@ -191,6 +191,8 @@ private: set paxos_recovered; ///< num paxos machines fully recovered during this election epoch version_t global_version; + void require_gv_ondisk(); + public: void recovered_leader(int id); void recovered_peon(int id); -- 2.39.5