From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sat, 16 Jul 2016 03:40:17 +0000 (-0400)
Subject: mds: use FSMap::insert to add to standby_daemons
X-Git-Tag: v10.2.6~34^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=be8bc1195270b87bdc0840b36684863d990404df;p=ceph.git

mds: use FSMap::insert to add to standby_daemons

This reduces the number of code sites which modify standby_daemons.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 9566ae27b33dd4d266ee9223dc73738922b6eceb)
---

diff --git a/src/mds/FSMap.cc b/src/mds/FSMap.cc
index d554cd7811f..f038b49d098 100644
--- a/src/mds/FSMap.cc
+++ b/src/mds/FSMap.cc
@@ -430,9 +430,7 @@ void FSMap::decode(bufferlist::iterator& p)
           p.second.rank = p.second.standby_for_rank;
         }
         if (p.second.rank == MDS_RANK_NONE) {
-          standby_daemons[p.first] = p.second;
-          standby_epochs[p.first] = epoch;
-          mds_roles[p.first] = FS_CLUSTER_ID_NONE;
+          insert(p.second); // into standby_daemons
         } else {
           mds_roles[p.first] = migrate_fs->fscid;
         }