From: Sage Weil <sage@redhat.com>
Date: Thu, 18 Oct 2018 22:24:24 +0000 (-0500)
Subject: mgr/DaemonState: clear devices in set_metadata
X-Git-Tag: v14.1.0~1048^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c52fc7b5d34f951bc10abbd86a8fb3553ef3a416;p=ceph.git

mgr/DaemonState: clear devices in set_metadata

We are adding new fields in the new data provided; clear out any from the
previous values.

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

diff --git a/src/mgr/DaemonState.h b/src/mgr/DaemonState.h
index f706aab3080d..d0822fee8860 100644
--- a/src/mgr/DaemonState.h
+++ b/src/mgr/DaemonState.h
@@ -168,6 +168,7 @@ class DaemonState
   }
 
   void set_metadata(const std::map<std::string,std::string>& m) {
+    devices.clear();
     metadata = m;
     auto p = m.find("device_ids");
     if (p != m.end()) {