From 1f81fda58ce6e3994ebcab07d88668859b3e0f89 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Wed, 18 Dec 2013 17:53:11 -0800 Subject: [PATCH] OSDMap: dedup the primary_temp Signed-off-by: Greg Farnum --- src/osd/OSDMap.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 58325a5755a3a..da1cd1886c3cc 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -1017,6 +1017,12 @@ void OSDMap::dedup(const OSDMap *o, OSDMap *n) n->pg_temp = o->pg_temp; } + // does primary_temp match? + if (o->primary_temp->size() == n->primary_temp->size()) { + if (*o->primary_temp == *n->primary_temp) + n->primary_temp = o->primary_temp; + } + // do uuids match? if (o->osd_uuid->size() == n->osd_uuid->size() && *o->osd_uuid == *n->osd_uuid) -- 2.39.5