From: Michal Jarzabek <stiopa@gmail.com>
Date: Sun, 9 Oct 2016 13:07:41 +0000 (+0100)
Subject: mds/FSMap.cc: remove unneeded use of count
X-Git-Tag: v11.1.0~647^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F11402%2Fhead;p=ceph.git

mds/FSMap.cc: remove unneeded use of count

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
---

diff --git a/src/mds/FSMap.cc b/src/mds/FSMap.cc
index af798db1a216..3b0fdc4b6640 100644
--- a/src/mds/FSMap.cc
+++ b/src/mds/FSMap.cc
@@ -676,10 +676,9 @@ void FSMap::promote(
   }
   MDSMap::mds_info_t &info = mds_map.mds_info[standby_gid];
 
-  if (mds_map.stopped.count(assigned_rank)) {
+  if (mds_map.stopped.erase(assigned_rank)) {
     // The cluster is being expanded with a stopped rank
     info.state = MDSMap::STATE_STARTING;
-    mds_map.stopped.erase(assigned_rank);
   } else if (!mds_map.is_in(assigned_rank)) {
     // The cluster is being expanded with a new rank
     info.state = MDSMap::STATE_CREATING;
@@ -782,8 +781,7 @@ bool FSMap::undamaged(const fs_cluster_id_t fscid, const mds_rank_t rank)
 {
   auto fs = filesystems.at(fscid);
 
-  if (fs->mds_map.damaged.count(rank)) {
-    fs->mds_map.damaged.erase(rank);
+  if (fs->mds_map.damaged.erase(rank)) {
     fs->mds_map.failed.insert(rank);
     fs->mds_map.epoch = epoch;
     return true;