From 4711e4eff0d106454bf756c8cceff85e97816a4f Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Tue, 16 Feb 2021 12:23:53 +0000 Subject: [PATCH] crimson/osd: fetch configuration from monitors conditionally. Before this change we were always attempting to fetch the config from monitors, even if `--no-mon-config` had been passed. This was the reason for failures at teuthology like: http://pulpito.front.sepia.ceph.com/rzarzynski-2021-02-15_21:09:02-rados-master-distro-basic-smithi/5885250 Signed-off-by: Radoslaw Zarzynski --- src/crimson/osd/main.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc index 21654cddd1b..d4e72c29c1e 100644 --- a/src/crimson/osd/main.cc +++ b/src/crimson/osd/main.cc @@ -173,7 +173,8 @@ int main(int argc, char* argv[]) ("mkkey", "generate a new secret key. " "This is normally used in combination with --mkfs") ("mkfs", "create a [new] data directory") - ("debug", "enable debug output on all loggers"); + ("debug", "enable debug output on all loggers") + ("no-mon-config", "do not retrieve configuration from monitors on boot"); auto [ceph_args, app_args] = partition_args(app, argv, argv + argc); if (ceph_argparse_need_usage(ceph_args) && @@ -242,7 +243,9 @@ int main(int argc, char* argv[]) seastar::engine().exit(1); }).get(); } - fetch_config().get(); + if (config.count("no-mon-config") == 0) { + fetch_config().get(); + } if (config.count("mkfs")) { osd.invoke_on( 0, -- 2.39.5