From: Changcheng Liu <changcheng.liu@aliyun.com>
Date: Wed, 26 Aug 2020 01:52:57 +0000 (+0800)
Subject: osd/OSDMap: no need to give same locations per time to create bucket
X-Git-Tag: v16.1.0~1173^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dce22e308ff94112594e69da3f7aced9b005d8f4;p=ceph.git

osd/OSDMap: no need to give same locations per time to create bucket

Suggested-by: Kefu Chai <kefu@redhat.com>
Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index f54f00baa64b..f7a70aaefd96 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -4234,11 +4234,12 @@ int OSDMap::build_simple_crush_map(CephContext *cct, CrushWrapper& crush,
   ceph_assert(r == 0);
   crush.set_item_name(rootid, "default");
 
+  map<string,string> loc{
+    {"host", "localhost"},
+    {"rack", "localrack"},
+    {"root", "default"}
+  };
   for (int o=0; o<nosd; o++) {
-    map<string,string> loc;
-    loc["host"] = "localhost";
-    loc["rack"] = "localrack";
-    loc["root"] = "default";
     ldout(cct, 10) << " adding osd." << o << " at " << loc << dendl;
     char name[32];
     snprintf(name, sizeof(name), "osd.%d", o);