MB-32557: Remove "stats settings"

The settings stats group is not used by cbcollect_info so we
can remove it to reduce the amount of code to maintain.

Change-Id: I0e660427cb8735df34c15bc43524d80c91d70782
Reviewed-on: http://review.couchbase.org/103541
Tested-by: Build Bot <[email protected]>
Reviewed-by: Dave Rigby <[email protected]>

Author: trondn

daemon/protocol/mcbp/stats_context.cc

@@ -289,106 +289,6 @@ static ENGINE_ERROR_CODE server_stats(ADD_STAT add_stat_callback,
     return ENGINE_SUCCESS;
 }
 
-static void process_stat_settings(ADD_STAT add_stat_callback, Cookie& cookie) {
-    if (add_stat_callback == nullptr) {
-        throw std::invalid_argument("process_stat_settings: "
-                                        "add_stat_callback must be non-NULL");
-    }
-    add_stat(cookie, add_stat_callback, "maxconns", settings.getMaxconns());
-
-    try {
-        for (auto& ifce : stats.listening_ports) {
-            char interface[1024];
-            int offset;
-            if (ifce.host.empty()) {
-                offset = checked_snprintf(interface, sizeof(interface),
-                                          "interface-*:%u",
-                                          ifce.port);
-            } else {
-                offset = checked_snprintf(interface, sizeof(interface),
-                                          "interface-%s:%u",
-                                          ifce.host.c_str(),
-                                          ifce.port);
-            }
-
-            checked_snprintf(interface + offset, sizeof(interface) - offset,
-                             "-maxconn");
-            add_stat(cookie, add_stat_callback, interface, ifce.maxconns);
-            checked_snprintf(interface + offset, sizeof(interface) - offset,
-                             "-ipv4");
-            add_stat(cookie, add_stat_callback, interface, ifce.ipv4);
-            checked_snprintf(interface + offset, sizeof(interface) - offset,
-                             "-ipv6");
-            add_stat(cookie, add_stat_callback, interface, ifce.ipv6);
-
-            checked_snprintf(interface + offset, sizeof(interface) - offset,
-                             "-tcp_nodelay");
-            add_stat(cookie, add_stat_callback, interface, ifce.tcp_nodelay);
-
-            auto ssl = ifce.getSslSettings();
-            if (ssl) {
-                checked_snprintf(interface + offset, sizeof(interface) - offset,
-                                 "-ssl-pkey");
-                add_stat(cookie, add_stat_callback, interface, ssl->key);
-                checked_snprintf(interface + offset, sizeof(interface) - offset,
-                                 "-ssl-cert");
-                add_stat(cookie, add_stat_callback, interface, ssl->cert);
-            } else {
-                checked_snprintf(interface + offset, sizeof(interface) - offset,
-                                 "-ssl");
-                add_stat(cookie, add_stat_callback, interface, "false");
-            }
-        }
-    } catch (const std::exception& error) {
-        LOG_WARNING("process_stats_settings: Error building stats: {}",
-                    error.what());
-    }
-
-    add_stat(cookie, add_stat_callback, "verbosity", settings.getVerbose());
-    add_stat(cookie, add_stat_callback, "num_threads", settings.getNumWorkerThreads());
-    add_stat(cookie, add_stat_callback, "reqs_per_event_high_priority",
-             settings.getRequestsPerEventNotification(EventPriority::High));
-    add_stat(cookie, add_stat_callback, "reqs_per_event_med_priority",
-             settings.getRequestsPerEventNotification(EventPriority::Medium));
-    add_stat(cookie, add_stat_callback, "reqs_per_event_low_priority",
-             settings.getRequestsPerEventNotification(EventPriority::Low));
-    add_stat(cookie, add_stat_callback, "reqs_per_event_def_priority",
-             settings.getRequestsPerEventNotification(EventPriority::Default));
-    add_stat(cookie, add_stat_callback, "auth_enabled_sasl", "yes");
-    add_stat(cookie, add_stat_callback, "auth_sasl_engine", "cbsasl");
-
-    add_stat(cookie, add_stat_callback, "audit",
-             settings.getAuditFile().c_str());
-
-    add_stat(cookie, add_stat_callback, "connection_idle_time",
-             std::to_string(settings.getConnectionIdleTime()).c_str());
-    add_stat(cookie,
-             add_stat_callback,
-             "datatype_json",
-             settings.isDatatypeJsonEnabled() ? "true" : "false");
-    add_stat(cookie,
-             add_stat_callback,
-             "datatype_snappy",
-             settings.isDatatypeSnappyEnabled() ? "true" : "false");
-    add_stat(cookie, add_stat_callback, "dedupe_nmvb_maps",
-             settings.isDedupeNmvbMaps() ? "true" : "false");
-    add_stat(cookie, add_stat_callback, "max_packet_size",
-             std::to_string(settings.getMaxPacketSize()).c_str());
-    add_stat(cookie, add_stat_callback, "xattr_enabled",
-            settings.isXattrEnabled());
-    add_stat(cookie, add_stat_callback, "privilege_debug",
-             settings.isPrivilegeDebug());
-
-    add_stat(cookie,
-             add_stat_callback,
-             "collections_enabled",
-             settings.isCollectionsEnabled());
-    add_stat(cookie,
-             add_stat_callback,
-             "external_auth_service",
-             settings.isExternalAuthServiceEnabled());
-}
-
 static void append_bin_stats(const char* key,
                              const uint16_t klen,
                              const char* val,
@@ -529,23 +429,6 @@ static ENGINE_ERROR_CODE stat_sched_executor(const std::string& arg,
     }
 }
 
-/**
- * Handler for the <code>stats settings</code> used to get the current
- * settings.
- *
- * @param arg - should be empty
- * @param cookie the command context
- */
-static ENGINE_ERROR_CODE stat_settings_executor(const std::string& arg,
-                                                Cookie& cookie) {
-    if (arg.empty()) {
-        process_stat_settings(&append_stats, cookie);
-        return ENGINE_SUCCESS;
-    } else {
-        return ENGINE_EINVAL;
-    }
-}
-
 /**
  * Handler for the <code>stats audit</code> used to get statistics from
  * the audit subsystem.
@@ -849,7 +732,6 @@ static std::unordered_map<std::string, struct command_stat_handler>
                 {"", {false, stat_all_stats}},
                 {"reset", {true, stat_reset_executor}},
                 {"worker_thread_info", {false, stat_sched_executor}},
-                {"settings", {false, stat_settings_executor}},
                 {"audit", {true, stat_audit_executor}},
                 {"bucket_details", {true, stat_bucket_details_executor}},
                 {"aggregate", {false, stat_aggregate_executor}},

tests/testapp/testapp_stats.cc

@@ -267,35 +267,6 @@ TEST_P(StatsTest, TestAppend) {
     EXPECT_EQ(11, cmd_set->valueint);
 }
 
-TEST_P(StatsTest, TestSettings) {
-    MemcachedConnection& conn = getConnection();
-    // @todo verify that I get all of the expected settings. for now
-    //       just verify that I've got the ones I expect...
-    unique_cJSON_ptr stats;
-    ASSERT_NO_THROW(stats = conn.stats("settings"));
-    ASSERT_NE(nullptr, stats.get());
-    ASSERT_NE(nullptr, cJSON_GetObjectItem(stats.get(), "maxconns"));
-
-    // skip interfaces....
-
-    ASSERT_NE(nullptr, cJSON_GetObjectItem(stats.get(), "verbosity"));
-    ASSERT_NE(nullptr, cJSON_GetObjectItem(stats.get(), "num_threads"));
-    ASSERT_NE(nullptr,
-              cJSON_GetObjectItem(stats.get(), "reqs_per_event_high_priority"));
-    ASSERT_NE(nullptr,
-              cJSON_GetObjectItem(stats.get(), "reqs_per_event_med_priority"));
-    ASSERT_NE(nullptr,
-              cJSON_GetObjectItem(stats.get(), "reqs_per_event_low_priority"));
-    ASSERT_NE(nullptr,
-              cJSON_GetObjectItem(stats.get(), "reqs_per_event_def_priority"));
-    ASSERT_NE(nullptr, cJSON_GetObjectItem(stats.get(), "auth_enabled_sasl"));
-    ASSERT_NE(nullptr, cJSON_GetObjectItem(stats.get(), "auth_sasl_engine"));
-
-    // skip extensions, loggers and daemons
-
-    // Skip audit.. it is "optional" and we don't pass it to the config
-}
-
 TEST_P(StatsTest, TestAuditNoAccess) {
     MemcachedConnection& conn = getConnection();