From: Kefu Chai <kchai@redhat.com>
Date: Fri, 23 Apr 2021 11:16:37 +0000 (+0800)
Subject: common/options: dedup Option::services
X-Git-Tag: v17.1.0~1968^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=11ba501a56ecd33a862861c68dede658946e9831;p=ceph.git

common/options: dedup Option::services

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

diff --git a/src/common/options/build_options.cc b/src/common/options/build_options.cc
index ec3a1f9ecda89..323548d16fabc 100644
--- a/src/common/options/build_options.cc
+++ b/src/common/options/build_options.cc
@@ -3,6 +3,9 @@
 
 #include "build_options.h"
 
+#include <algorithm>
+#include <cstring>
+
 std::vector<Option> get_global_options();
 std::vector<Option> get_mgr_options();
 std::vector<Option> get_crimson_options();
@@ -21,7 +24,12 @@ std::vector<Option> build_options()
 
   auto ingest = [&result](std::vector<Option>&& options, const char* svc) {
     for (auto &o : options) {
-      o.add_service(svc);
+      if (std::none_of(o.services.begin(), o.services.end(),
+                       [svc](const char* known_svc) {
+                         return std::strcmp(known_svc, svc) == 0;
+                       })) {
+        o.add_service(svc);
+      }
       result.push_back(std::move(o));
     }
   };