From: Kefu Chai <kchai@redhat.com>
Date: Thu, 27 Aug 2020 13:15:42 +0000 (+0800)
Subject: crimson/admin: make injected_args optional
X-Git-Tag: v16.1.0~1268^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2cc515a0134621394246c8f8990bf59dc11870fb;p=ceph.git

crimson/admin: make injected_args optional

this option for `injectargs` command is optional, so we should not
crash if it does not exist.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/admin/admin_socket.cc b/src/crimson/admin/admin_socket.cc
index 29ad2095bab6..2913298d0d58 100644
--- a/src/crimson/admin/admin_socket.cc
+++ b/src/crimson/admin/admin_socket.cc
@@ -397,8 +397,9 @@ public:
 				      ceph::bufferlist&&) const final
   {
     std::vector<std::string> argv;
-    [[maybe_unused]] bool found = cmd_getval(cmdmap, "injected_args", argv);
-    assert(found);
+    if (!cmd_getval(cmdmap, "injected_args", argv)) {
+      return seastar::make_ready_future<tell_result_t>();
+    }
     const std::string args = boost::algorithm::join(argv, " ");
     return local_conf().inject_args(args).then([] {
       return seastar::make_ready_future<tell_result_t>();