From: Sage Weil <sage@redhat.com>
Date: Mon, 15 May 2017 13:34:11 +0000 (-0400)
Subject: mon/OSDMonitor: fix osd metadata update ordering
X-Git-Tag: v12.1.0~57^2~6^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3d6b6d72f76f57034de25a267a8b49d520547715;p=ceph.git

mon/OSDMonitor: fix osd metadata update ordering

Do not do both.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 55d459b3fac..d94ee192e6f 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 {