From 3d6b6d72f76f57034de25a267a8b49d520547715 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 15 May 2017 09:34:11 -0400 Subject: [PATCH] mon/OSDMonitor: fix osd metadata update ordering Do not do both. Signed-off-by: Sage Weil --- src/mon/OSDMonitor.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 55d459b3fac1..d94ee192e6f1 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -2371,6 +2371,7 @@ bool OSDMonitor::prepare_boot(MonOpRequestRef op) bufferlist osd_metadata; ::encode(m->metadata, osd_metadata); pending_metadata[from] = osd_metadata; + pending_metadata_rm.erase(from); // adjust last clean unmount epoch? const osd_info_t& info = osdmap.get_info(from); @@ -7694,6 +7695,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, pending_inc.new_state[osd] = osdmap.get_state(osd); pending_inc.new_uuid[osd] = uuid_d(); pending_metadata_rm.insert(osd); + pending_metadata.erase(osd); if (any) { ss << ", osd." << osd; } else { -- 2.47.3