From df5f4e54387f0a15ea862f6f3f6402d174c03349 Mon Sep 17 00:00:00 2001 From: chunmei-liu Date: Wed, 3 Nov 2021 15:03:24 -0700 Subject: [PATCH] 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 --- src/crimson/osd/main.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc index 18b7d520b88..3742e313af7 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("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("osd_uuid"), + osd_uuid, local_conf().get_val("fsid")).get(); } if (config.count("mkkey") || config.count("mkfs")) { -- 2.39.5