From: chunmei-liu <chunmei.liu@intel.com>
Date: Wed, 3 Nov 2021 22:03:24 +0000 (-0700)
Subject: crimson/osd: randomize the osd_uuid if not specified
X-Git-Tag: v17.1.0~520^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=df5f4e54387f0a15ea862f6f3f6402d174c03349;p=ceph.git

crimson/osd: randomize the osd_uuid if not specified

address the failure spotted in teuthology based test:
sudo ceph --cluster ceph osd new 00000000-0000-0000-0000-000000000000 0

Signed-off-by: chunmei-liu <chunmei.liu@intel.com>
---

diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc
index 18b7d520b8892..3742e313af7cf 100644
--- a/src/crimson/osd/main.cc
+++ b/src/crimson/osd/main.cc
@@ -330,10 +330,15 @@ int main(int argc, char* argv[])
             fetch_config().get();
           }
           if (config.count("mkfs")) {
+            auto osd_uuid = local_conf().get_val<uuid_d>("osd_uuid");
+            if (osd_uuid.is_zero()) {
+              // use a random osd uuid if not specified
+              osd_uuid.generate_random();
+            }
             osd.invoke_on(
               0,
               &crimson::osd::OSD::mkfs,
-              local_conf().get_val<uuid_d>("osd_uuid"),
+              osd_uuid,
               local_conf().get_val<uuid_d>("fsid")).get();
           }
           if (config.count("mkkey") || config.count("mkfs")) {