From 051224bbac6aa28f7988873fb7849976813f2c51 Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Fri, 24 Dec 2021 16:12:13 +0800 Subject: [PATCH] crimson/osd: --help-seastar does no longer belong to unknown_args Now that app_template handles --help-seastar, and prints out all app-level usages if --help is included in command line options. There is no need to add a dedicated --help-seastar by ourselves and translate it to --help. Signed-off-by: Yingxin Cheng --- src/crimson/osd/main.cc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc index 23ec839ca4680..d3eab632bda74 100644 --- a/src/crimson/osd/main.cc +++ b/src/crimson/osd/main.cc @@ -37,8 +37,8 @@ seastar::logger& logger() { } void usage(const char* prog) { - std::cout << "usage: " << prog << " -i \n" - << " --help-seastar show Seastar help messages\n"; + std::cout << "usage: " << prog << "\n" + << " -i \n"; generic_server_usage(); } @@ -71,11 +71,7 @@ auto partition_args(seastar::app_template& app, char** argv_begin, char** argv_e for (; unknown != unknown_args.end() && argv != argv_end && *unknown == *argv; ++argv, ++unknown) { - if (std::strcmp(*argv, "--help-seastar") == 0) { - app_args.push_back("--help"); - } else { - ceph_args.push_back(*argv); - } + ceph_args.push_back(*argv); } return argv; }; -- 2.39.5