From c69da552b5213e355652428f53780b6825c25b84 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 7 Feb 2020 11:48:02 -0600 Subject: [PATCH] mimic: common/config: parse --log-early but ignore it Ideally we woudl backport 933d5084cb66f299a7bf60f0a2a6382c0bd3cb2f, but it does not apply cleanly to mimic. Among other things, we modifies behavior that changed in cd6a5b9c40779956629803f222c365bdb291a169 and the related commits, which is non-trivial and not worth backporting. We want this in mimic anyway because ceph_manager.py is now passing it for all of the raw_cluster_cmds, and it would be even more awkward to make that behavior conditional on version. Fixes: https://tracker.ceph.com/issues/43946 Signed-off-by: Sage Weil --- src/common/config.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/common/config.cc b/src/common/config.cc index 24ac74c6dbd31..748e7d29bacc0 100644 --- a/src/common/config.cc +++ b/src/common/config.cc @@ -575,6 +575,11 @@ int md_config_t::parse_argv(std::vector& args, int level) else if (ceph_argparse_flag(args, i, "--no-mon-config", (char*)NULL)) { no_mon_config = true; } + else if (ceph_argparse_flag(args, i, "--log-early", (char*)NULL)) { + // parse but ignore this option + cerr << "WARNING: ignoring --log-early option (not implemented)" + << std::endl; + } else if (ceph_argparse_flag(args, i, "--mon-config", (char*)NULL)) { no_mon_config = false; } -- 2.39.5