From 7559f1c04514f45194754ece4fbc4193f8795bf7 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 19 May 2017 11:07:34 -0400 Subject: [PATCH] mon/MgrStatMonitor: wrap digest encoding in bufferlist This is just for bigbang's benefit. Signed-off-by: Sage Weil --- src/mon/MgrStatMonitor.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/mon/MgrStatMonitor.cc b/src/mon/MgrStatMonitor.cc index ff040366aa7..a0e14c2460f 100644 --- a/src/mon/MgrStatMonitor.cc +++ b/src/mon/MgrStatMonitor.cc @@ -89,7 +89,10 @@ void MgrStatMonitor::update_from_paxos(bool *need_bootstrap) if (version) { assert(bl.length()); auto p = bl.begin(); - ::decode(digest, p); + bufferlist digestbl; + ::decode(digestbl, p); + auto q = digestbl.begin(); + ::decode(digest, q); ::decode(health_summary, p); ::decode(health_detail, p); } @@ -106,8 +109,9 @@ void MgrStatMonitor::encode_pending(MonitorDBStore::TransactionRef t) { ++version; dout(10) << __func__ << " " << version << dendl; - bufferlist bl; - ::encode(pending_digest, bl, mon->get_quorum_con_features()); + bufferlist digestbl, bl; + ::encode(pending_digest, digestbl, mon->get_quorum_con_features()); + ::encode(digestbl, bl); ::encode(pending_health_summary, bl); ::encode(pending_health_detail, bl); put_version(t, version, bl); -- 2.39.5