From: Changcheng Liu <changcheng.liu@aliyun.com>
Date: Wed, 26 Aug 2020 07:47:04 +0000 (+0800)
Subject: osd/OSDMap: avoid re-initialize osd state and weight done in set_max_osd
X-Git-Tag: v16.1.0~1173^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=02abda02144585bbda6207036bcca26d3dc64cb4;p=ceph.git

osd/OSDMap: avoid re-initialize osd state and weight done in set_max_osd

In set_max_osd function, container's osd_weight and osd_vector have been
assigned with the right state/weight value.

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index e61780ccda2d..cd920f888447 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -4188,11 +4188,6 @@ int OSDMap::build_simple_optioned(CephContext *cct, epoch_t e, uuid_d &fsid,
     }
   }
 
-  for (int i=0; i<get_max_osd(); i++) {
-    set_state(i, 0);
-    set_weight(i, CEPH_OSD_OUT);
-  }
-
   map<string,string> profile_map;
   r = get_erasure_code_profile_default(cct, profile_map, &ss);
   if (r < 0) {