]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd: randomize the osd_uuid if not specified 43781/head
authorchunmei-liu <chunmei.liu@intel.com>
Wed, 3 Nov 2021 22:03:24 +0000 (15:03 -0700)
committerchunmei-liu <chunmei.liu@intel.com>
Thu, 4 Nov 2021 01:48:02 +0000 (18:48 -0700)
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>
src/crimson/osd/main.cc

index 18b7d520b889239079d26335ca1a554f6a06ebcb..3742e313af7cf8e4ab8ef38b55520c237837263f 100644 (file)
@@ -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")) {