From 980f684b66a8ef7eabeeedb6a4b4d36cc66bb45f Mon Sep 17 00:00:00 2001 From: John Spray Date: Sat, 12 Mar 2016 17:50:15 +0000 Subject: [PATCH] mon: name cleanup s/mdsmap_bl/fsmap_bl/ Signed-off-by: John Spray --- src/mon/MDSMonitor.cc | 14 +++++++------- src/mon/MDSMonitor.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index 761b495b6306c..7c37840da0ea8 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -133,13 +133,13 @@ void MDSMonitor::update_from_paxos(bool *need_bootstrap) assert(version >= fsmap.epoch); // read and decode - mdsmap_bl.clear(); - int err = get_version(version, mdsmap_bl); + fsmap_bl.clear(); + int err = get_version(version, fsmap_bl); assert(err == 0); - assert(mdsmap_bl.length() > 0); + assert(fsmap_bl.length() > 0); dout(10) << __func__ << " got " << version << dendl; - fsmap.decode(mdsmap_bl); + fsmap.decode(fsmap_bl); // new map dout(4) << "new map" << dendl; @@ -181,11 +181,11 @@ void MDSMonitor::encode_pending(MonitorDBStore::TransactionRef t) // apply to paxos assert(get_last_committed() + 1 == pending_fsmap.epoch); - bufferlist mdsmap_bl; - pending_fsmap.encode(mdsmap_bl, mon->get_quorum_features()); + bufferlist fsmap_bl; + pending_fsmap.encode(fsmap_bl, mon->get_quorum_features()); /* put everything in the transaction */ - put_version(t, pending_fsmap.epoch, mdsmap_bl); + put_version(t, pending_fsmap.epoch, fsmap_bl); put_last_committed(t, pending_fsmap.epoch); // Encode MDSHealth data diff --git a/src/mon/MDSMonitor.h b/src/mon/MDSMonitor.h index 2f4b19374bc62..419deaa19d72e 100644 --- a/src/mon/MDSMonitor.h +++ b/src/mon/MDSMonitor.h @@ -42,8 +42,8 @@ class FileSystemCommandHandler; class MDSMonitor : public PaxosService { public: // mds maps - FSMap fsmap; // current - bufferlist mdsmap_bl; // encoded + FSMap fsmap; // current + bufferlist fsmap_bl; // encoded FSMap pending_fsmap; // current + pending updates -- 2.39.5