From 637de4d762636115b6ec50b61e6701a9e09d87f1 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 20 Apr 2012 12:55:35 -0700 Subject: [PATCH] mon: load CompatSet features on startup Signed-off-by: Sage Weil --- src/mon/Monitor.cc | 13 +++++++++++++ src/mon/Monitor.h | 2 ++ 2 files changed, 15 insertions(+) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 0ff20e356d7b9..91f65dab3968a 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -266,6 +266,19 @@ void Monitor::init() cluster_logger = pcb.create_perf_counters(); } + // open compatset + { + bufferlist bl; + store->get_bl_ss(bl, COMPAT_SET_LOC, 0); + if (bl.length()) { + bufferlist::iterator p = bl.begin(); + ::decode(features, p); + } else { + features = get_ceph_mon_feature_compat_set(); + } + dout(10) << "features " << features << dendl; + } + // init paxos for (int i = 0; i < PAXOS_NUM; ++i) { paxos[i]->init(); diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h index d16207b46d0c3..53092bdbed216 100644 --- a/src/mon/Monitor.h +++ b/src/mon/Monitor.h @@ -115,6 +115,8 @@ public: AuthSupported auth_supported; + CompatSet features; + private: void new_tick(); friend class C_Mon_Tick; -- 2.39.5