From: Yingxin Cheng <yingxin.cheng@intel.com>
Date: Fri, 24 Dec 2021 08:12:13 +0000 (+0800)
Subject: crimson/osd: --help-seastar does no longer belong to unknown_args
X-Git-Tag: v17.1.0~163^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=051224bbac6aa28f7988873fb7849976813f2c51;p=ceph.git

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 <yingxin.cheng@intel.com>
---

diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc
index 23ec839ca468..d3eab632bda7 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 <ID>\n"
-            << "  --help-seastar    show Seastar help messages\n";
+  std::cout << "usage: " << prog << "\n"
+            << "  -i <ID>\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;
   };