From 4672e50922b75d642056020b9745a3a5844424d3 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 26 Aug 2014 08:16:29 -0700 Subject: [PATCH] osd/OSDMap: encode blacklist in deterministic order When we use an unordered_map the encoding order is non-deterministic, which is problematic for OSDMap. Construct an ordered map<> on encode and use that. This lets us keep the hash table for lookups in the general case. Fixes: #9211 Backport: firefly Signed-off-by: Sage Weil --- src/osd/OSDMap.cc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index f807a313eabf..515d47dbdc5a 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -1760,7 +1760,15 @@ void OSDMap::encode_classic(bufferlist& bl, uint64_t features) const ::encode(ev, bl); ::encode(osd_addrs->hb_back_addr, bl); ::encode(osd_info, bl); - ::encode(blacklist, bl); + { + // put this in a sorted, ordered map<> so that we encode in a + // deterministic order. + map blacklist_map; + for (ceph::unordered_map::const_iterator p = + blacklist.begin(); p != blacklist.end(); ++p) + blacklist_map.insert(make_pair(p->first, p->second)); + ::encode(blacklist_map, bl); + } ::encode(osd_addrs->cluster_addr, bl); ::encode(cluster_snapshot_epoch, bl); ::encode(cluster_snapshot, bl); @@ -2176,6 +2184,7 @@ void OSDMap::generate_test_instances(list& o) uuid_d fsid; o.back()->build_simple(cct, 1, fsid, 16, 7, 8); o.back()->created = o.back()->modified = utime_t(1, 2); // fix timestamp + o.back()->blacklist[entity_addr_t()] = utime_t(5, 6); cct->put(); } -- 2.47.3