summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mongo/db/commands/server_status.cpp14
-rw-r--r--src/mongo/db/commands/server_status.h14
-rw-r--r--src/mongo/db/commands/server_status_servers.cpp19
-rw-r--r--src/mongo/db/free_mon/free_mon_status.cpp1
-rw-r--r--src/mongo/db/logical_session_server_status_section.cpp9
-rw-r--r--src/mongo/db/repl/replication_info.cpp47
-rw-r--r--src/mongo/db/s/sharding_server_status.cpp1
-rw-r--r--src/mongo/db/server_transactions_metrics.cpp11
-rw-r--r--src/mongo/db/stats/latency_server_status_section.cpp5
-rw-r--r--src/mongo/db/stats/lock_server_status_section.cpp13
-rw-r--r--src/mongo/db/storage/storage_init.cpp13
-rw-r--r--src/mongo/db/storage/wiredtiger/wiredtiger_server_status.cpp3
-rw-r--r--src/mongo/db/storage/wiredtiger/wiredtiger_server_status.h9
-rw-r--r--src/mongo/s/s_sharding_server_status.cpp1
-rw-r--r--src/mongo/util/heap_profiler.cpp1
-rw-r--r--src/mongo/util/net/ssl_manager.cpp9
-rw-r--r--src/mongo/util/tcmalloc_server_status_section.cpp12
17 files changed, 93 insertions, 89 deletions
diff --git a/src/mongo/db/commands/server_status.cpp b/src/mongo/db/commands/server_status.cpp
index cc73a148cb8..aa0b74ed1cc 100644
--- a/src/mongo/db/commands/server_status.cpp
+++ b/src/mongo/db/commands/server_status.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
@@ -229,11 +228,13 @@ namespace {
class ExtraInfo : public ServerStatusSection {
public:
ExtraInfo() : ServerStatusSection("extra_info") {}
- virtual bool includeByDefault() const {
+
+ bool includeByDefault() const override {
return true;
}
- BSONObj generateSection(OperationContext* opCtx, const BSONElement& configElement) const {
+ BSONObj generateSection(OperationContext* opCtx,
+ const BSONElement& configElement) const override {
BSONObjBuilder bb;
bb.append("note", "fields vary by platform");
@@ -245,15 +246,16 @@ public:
} extraInfo;
-
class Asserts : public ServerStatusSection {
public:
Asserts() : ServerStatusSection("asserts") {}
- virtual bool includeByDefault() const {
+
+ bool includeByDefault() const override {
return true;
}
- BSONObj generateSection(OperationContext* opCtx, const BSONElement& configElement) const {
+ BSONObj generateSection(OperationContext* opCtx,
+ const BSONElement& configElement) const override {
BSONObjBuilder asserts;
asserts.append("regular", assertionCount.regular.loadRelaxed());
asserts.append("warning", assertionCount.warning.loadRelaxed());
diff --git a/src/mongo/db/commands/server_status.h b/src/mongo/db/commands/server_status.h
index 5816e23134f..c803710bff6 100644
--- a/src/mongo/db/commands/server_status.h
+++ b/src/mongo/db/commands/server_status.h
@@ -1,6 +1,3 @@
-// server_status.h
-
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
@@ -43,7 +40,7 @@ namespace mongo {
class ServerStatusSection {
public:
ServerStatusSection(const std::string& sectionName);
- virtual ~ServerStatusSection() {}
+ virtual ~ServerStatusSection() = default;
const std::string& getSectionName() const {
return _sectionName;
@@ -113,14 +110,15 @@ private:
class OpCounterServerStatusSection : public ServerStatusSection {
public:
OpCounterServerStatusSection(const std::string& sectionName, OpCounters* counters);
- virtual bool includeByDefault() const {
+
+ bool includeByDefault() const override {
return true;
}
- virtual BSONObj generateSection(OperationContext* opCtx,
- const BSONElement& configElement) const;
+ BSONObj generateSection(OperationContext* opCtx,
+ const BSONElement& configElement) const override;
private:
const OpCounters* _counters;
};
-}
+} // namespace mongo
diff --git a/src/mongo/db/commands/server_status_servers.cpp b/src/mongo/db/commands/server_status_servers.cpp
index f9e1bc51fff..022e64186af 100644
--- a/src/mongo/db/commands/server_status_servers.cpp
+++ b/src/mongo/db/commands/server_status_servers.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
@@ -54,11 +53,13 @@ namespace {
class Connections : public ServerStatusSection {
public:
Connections() : ServerStatusSection("connections") {}
- virtual bool includeByDefault() const {
+
+ bool includeByDefault() const override {
return true;
}
- BSONObj generateSection(OperationContext* opCtx, const BSONElement& configElement) const {
+ BSONObj generateSection(OperationContext* opCtx,
+ const BSONElement& configElement) const override {
BSONObjBuilder bb;
auto serviceEntryPoint = opCtx->getServiceContext()->getServiceEntryPoint();
@@ -73,11 +74,13 @@ public:
class Network : public ServerStatusSection {
public:
Network() : ServerStatusSection("network") {}
- virtual bool includeByDefault() const {
+
+ bool includeByDefault() const override {
return true;
}
- BSONObj generateSection(OperationContext* opCtx, const BSONElement& configElement) const {
+ BSONObj generateSection(OperationContext* opCtx,
+ const BSONElement& configElement) const override {
BSONObjBuilder b;
networkCounter.append(b);
appendMessageCompressionStats(&b);
@@ -96,11 +99,13 @@ public:
class Security : public ServerStatusSection {
public:
Security() : ServerStatusSection("security") {}
- virtual bool includeByDefault() const {
+
+ bool includeByDefault() const override {
return true;
}
- BSONObj generateSection(OperationContext* opCtx, const BSONElement& configElement) const {
+ BSONObj generateSection(OperationContext* opCtx,
+ const BSONElement& configElement) const override {
BSONObj result;
if (getSSLManager()) {
result = getSSLManager()->getSSLConfiguration().getServerStatusBSON();
diff --git a/src/mongo/db/free_mon/free_mon_status.cpp b/src/mongo/db/free_mon/free_mon_status.cpp
index 63bc5ce4b22..dc201956a8d 100644
--- a/src/mongo/db/free_mon/free_mon_status.cpp
+++ b/src/mongo/db/free_mon/free_mon_status.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/db/logical_session_server_status_section.cpp b/src/mongo/db/logical_session_server_status_section.cpp
index 86b31229058..971748f7de6 100644
--- a/src/mongo/db/logical_session_server_status_section.cpp
+++ b/src/mongo/db/logical_session_server_status_section.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
@@ -43,14 +42,14 @@ class LogicalSessionSSS : public ServerStatusSection {
public:
LogicalSessionSSS() : ServerStatusSection("logicalSessionRecordCache") {}
- virtual ~LogicalSessionSSS() {}
+ ~LogicalSessionSSS() override = default;
- virtual bool includeByDefault() const {
+ bool includeByDefault() const override {
return true;
}
- virtual BSONObj generateSection(OperationContext* opCtx,
- const BSONElement& configElement) const {
+ BSONObj generateSection(OperationContext* opCtx,
+ const BSONElement& configElement) const override {
auto lsCache = LogicalSessionCache::get(opCtx);
return lsCache ? lsCache->getStats().toBSON() : BSONObj();
}
diff --git a/src/mongo/db/repl/replication_info.cpp b/src/mongo/db/repl/replication_info.cpp
index 8931feb5b97..c356d23e76f 100644
--- a/src/mongo/db/repl/replication_info.cpp
+++ b/src/mongo/db/repl/replication_info.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
@@ -150,14 +149,18 @@ void appendReplicationInfo(OperationContext* opCtx, BSONObjBuilder& result, int
}
}
+namespace {
+
class ReplicationInfoServerStatus : public ServerStatusSection {
public:
ReplicationInfoServerStatus() : ServerStatusSection("repl") {}
- bool includeByDefault() const {
+
+ bool includeByDefault() const override {
return true;
}
- BSONObj generateSection(OperationContext* opCtx, const BSONElement& configElement) const {
+ BSONObj generateSection(OperationContext* opCtx,
+ const BSONElement& configElement) const override {
if (!ReplicationCoordinator::get(opCtx)->isReplEnabled()) {
return BSONObj();
}
@@ -180,11 +183,13 @@ public:
class OplogInfoServerStatus : public ServerStatusSection {
public:
OplogInfoServerStatus() : ServerStatusSection("oplog") {}
- bool includeByDefault() const {
+
+ bool includeByDefault() const override {
return false;
}
- BSONObj generateSection(OperationContext* opCtx, const BSONElement& configElement) const {
+ BSONObj generateSection(OperationContext* opCtx,
+ const BSONElement& configElement) const override {
ReplicationCoordinator* replCoord = ReplicationCoordinator::get(opCtx);
if (!replCoord->isReplEnabled()) {
return BSONObj();
@@ -203,29 +208,35 @@ public:
}
} oplogInfoServerStatus;
-class CmdIsMaster : public BasicCommand {
+class CmdIsMaster final : public BasicCommand {
public:
- bool requiresAuth() const override {
+ CmdIsMaster() : BasicCommand("isMaster", "ismaster") {}
+
+ bool requiresAuth() const final {
return false;
}
- AllowedOnSecondary secondaryAllowed(ServiceContext*) const override {
+
+ AllowedOnSecondary secondaryAllowed(ServiceContext*) const final {
return AllowedOnSecondary::kAlways;
}
+
std::string help() const override {
return "Check if this server is primary for a replica set\n"
"{ isMaster : 1 }";
}
- virtual bool supportsWriteConcern(const BSONObj& cmd) const override {
+
+ bool supportsWriteConcern(const BSONObj& cmd) const final {
return false;
}
- virtual void addRequiredPrivileges(const std::string& dbname,
- const BSONObj& cmdObj,
- std::vector<Privilege>* out) const {} // No auth required
- CmdIsMaster() : BasicCommand("isMaster", "ismaster") {}
- virtual bool run(OperationContext* opCtx,
- const string&,
- const BSONObj& cmdObj,
- BSONObjBuilder& result) {
+
+ void addRequiredPrivileges(const std::string& dbname,
+ const BSONObj& cmdObj,
+ std::vector<Privilege>* out) const final {} // No auth required
+
+ bool run(OperationContext* opCtx,
+ const string&,
+ const BSONObj& cmdObj,
+ BSONObjBuilder& result) final {
/* currently request to arbiter is (somewhat arbitrarily) an ismaster request that is not
authenticated.
*/
@@ -385,5 +396,7 @@ public:
OpCounterServerStatusSection replOpCounterServerStatusSection("opcountersRepl", &replOpCounters);
+} // namespace
+
} // namespace repl
} // namespace mongo
diff --git a/src/mongo/db/s/sharding_server_status.cpp b/src/mongo/db/s/sharding_server_status.cpp
index 87c831755ca..03510548fb8 100644
--- a/src/mongo/db/s/sharding_server_status.cpp
+++ b/src/mongo/db/s/sharding_server_status.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/db/server_transactions_metrics.cpp b/src/mongo/db/server_transactions_metrics.cpp
index f02d644c0c0..11f6480d887 100644
--- a/src/mongo/db/server_transactions_metrics.cpp
+++ b/src/mongo/db/server_transactions_metrics.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
@@ -311,18 +310,19 @@ void ServerTransactionsMetrics::clearOpTimes() {
_oldestNonMajorityCommittedOpTimes.clear();
}
+namespace {
class TransactionsSSS : public ServerStatusSection {
public:
TransactionsSSS() : ServerStatusSection("transactions") {}
- virtual ~TransactionsSSS() {}
+ ~TransactionsSSS() override = default;
- virtual bool includeByDefault() const {
+ bool includeByDefault() const override {
return true;
}
- virtual BSONObj generateSection(OperationContext* opCtx,
- const BSONElement& configElement) const {
+ BSONObj generateSection(OperationContext* opCtx,
+ const BSONElement& configElement) const override {
TransactionsStats stats;
// Retryable writes and multi-document transactions metrics are both included in the same
@@ -335,5 +335,6 @@ public:
}
} transactionsSSS;
+} // namespace
} // namespace mongo
diff --git a/src/mongo/db/stats/latency_server_status_section.cpp b/src/mongo/db/stats/latency_server_status_section.cpp
index 733df834fab..9b15c5cb1dc 100644
--- a/src/mongo/db/stats/latency_server_status_section.cpp
+++ b/src/mongo/db/stats/latency_server_status_section.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
@@ -44,11 +43,11 @@ class GlobalHistogramServerStatusSection final : public ServerStatusSection {
public:
GlobalHistogramServerStatusSection() : ServerStatusSection("opLatencies") {}
- bool includeByDefault() const {
+ bool includeByDefault() const override {
return true;
}
- BSONObj generateSection(OperationContext* opCtx, const BSONElement& configElem) const {
+ BSONObj generateSection(OperationContext* opCtx, const BSONElement& configElem) const override {
BSONObjBuilder latencyBuilder;
bool includeHistograms = false;
if (configElem.type() == BSONType::Object) {
diff --git a/src/mongo/db/stats/lock_server_status_section.cpp b/src/mongo/db/stats/lock_server_status_section.cpp
index 7dbbd10ef02..692804dadaa 100644
--- a/src/mongo/db/stats/lock_server_status_section.cpp
+++ b/src/mongo/db/stats/lock_server_status_section.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
@@ -47,12 +46,12 @@ public:
_started = curTimeMillis64();
}
- virtual bool includeByDefault() const {
+ bool includeByDefault() const override {
return true;
}
- virtual BSONObj generateSection(OperationContext* opCtx,
- const BSONElement& configElement) const {
+ BSONObj generateSection(OperationContext* opCtx,
+ const BSONElement& configElement) const override {
std::valarray<int> clientStatusCounts(5);
// This returns the blocked lock states
@@ -110,12 +109,12 @@ class LockStatsServerStatusSection : public ServerStatusSection {
public:
LockStatsServerStatusSection() : ServerStatusSection("locks") {}
- virtual bool includeByDefault() const {
+ bool includeByDefault() const override {
return true;
}
- virtual BSONObj generateSection(OperationContext* opCtx,
- const BSONElement& configElement) const {
+ BSONObj generateSection(OperationContext* opCtx,
+ const BSONElement& configElement) const override {
BSONObjBuilder ret;
SingleThreadedLockStats stats;
diff --git a/src/mongo/db/storage/storage_init.cpp b/src/mongo/db/storage/storage_init.cpp
index 7cace5b3898..37b6746963c 100644
--- a/src/mongo/db/storage/storage_init.cpp
+++ b/src/mongo/db/storage/storage_init.cpp
@@ -1,6 +1,3 @@
-// storage_engine.cpp
-
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
@@ -41,22 +38,20 @@
#include "mongo/db/storage/storage_options.h"
namespace mongo {
-
-// TODO: Does this belong here?
namespace {
class StorageSSS : public ServerStatusSection {
public:
StorageSSS() : ServerStatusSection("storageEngine") {}
- virtual ~StorageSSS() {}
+ ~StorageSSS() override = default;
- virtual bool includeByDefault() const {
+ bool includeByDefault() const override {
return true;
}
- virtual BSONObj generateSection(OperationContext* opCtx,
- const BSONElement& configElement) const {
+ BSONObj generateSection(OperationContext* opCtx,
+ const BSONElement& configElement) const override {
auto svcCtx = opCtx->getClient()->getServiceContext();
auto engine = svcCtx->getStorageEngine();
auto backupCursorHooks = BackupCursorHooks::get(svcCtx);
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_server_status.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_server_status.cpp
index a3929f7b588..7e0c18ecb5f 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_server_status.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_server_status.cpp
@@ -1,6 +1,3 @@
-// wiredtiger_server_status.cpp
-
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_server_status.h b/src/mongo/db/storage/wiredtiger/wiredtiger_server_status.h
index 5e66dd2f0e5..9bea39b3398 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_server_status.h
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_server_status.h
@@ -1,6 +1,3 @@
-// wiredtiger_server_status.h
-
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
@@ -44,9 +41,9 @@ class WiredTigerKVEngine;
class WiredTigerServerStatusSection : public ServerStatusSection {
public:
WiredTigerServerStatusSection(WiredTigerKVEngine* engine);
- virtual bool includeByDefault() const;
- virtual BSONObj generateSection(OperationContext* opCtx,
- const BSONElement& configElement) const;
+ bool includeByDefault() const override;
+ BSONObj generateSection(OperationContext* opCtx,
+ const BSONElement& configElement) const override;
private:
WiredTigerKVEngine* _engine;
diff --git a/src/mongo/s/s_sharding_server_status.cpp b/src/mongo/s/s_sharding_server_status.cpp
index 01c14f9ca22..f06df21aff6 100644
--- a/src/mongo/s/s_sharding_server_status.cpp
+++ b/src/mongo/s/s_sharding_server_status.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/heap_profiler.cpp b/src/mongo/util/heap_profiler.cpp
index 7c8bb3f8ccc..449a2f71f37 100644
--- a/src/mongo/util/heap_profiler.cpp
+++ b/src/mongo/util/heap_profiler.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/ssl_manager.cpp b/src/mongo/util/net/ssl_manager.cpp
index bce07236b3e..a6c59494748 100644
--- a/src/mongo/util/net/ssl_manager.cpp
+++ b/src/mongo/util/net/ssl_manager.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
@@ -1000,6 +999,7 @@ std::string escapeRfc2253(StringData str) {
return ret;
}
+namespace {
/**
* Status section of which tls versions connected to MongoDB and completed an SSL handshake.
* Note: Clients are only not counted if they try to connect to the server with a unsupported TLS
@@ -1010,11 +1010,12 @@ class TLSVersionSatus : public ServerStatusSection {
public:
TLSVersionSatus() : ServerStatusSection("transportSecurity") {}
- bool includeByDefault() const final {
+ bool includeByDefault() const override {
return true;
}
- BSONObj generateSection(OperationContext* opCtx, const BSONElement& configElement) const final {
+ BSONObj generateSection(OperationContext* opCtx,
+ const BSONElement& configElement) const override {
auto& counts = TLSVersionCounts::get(opCtx->getServiceContext());
BSONObjBuilder builder;
@@ -1027,6 +1028,8 @@ public:
}
} tlsVersionStatus;
+} // namespace
+
void recordTLSVersion(TLSVersion version, const HostAndPort& hostForLogging) {
StringData versionString;
auto& counts = mongo::TLSVersionCounts::get(getGlobalServiceContext());
diff --git a/src/mongo/util/tcmalloc_server_status_section.cpp b/src/mongo/util/tcmalloc_server_status_section.cpp
index 125e0b5adc0..85ac74ffc4a 100644
--- a/src/mongo/util/tcmalloc_server_status_section.cpp
+++ b/src/mongo/util/tcmalloc_server_status_section.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
@@ -104,12 +103,13 @@ MONGO_INITIALIZER(TCMallocThreadIdleListener)(InitializerContext*) {
class TCMallocServerStatusSection : public ServerStatusSection {
public:
TCMallocServerStatusSection() : ServerStatusSection("tcmalloc") {}
- virtual bool includeByDefault() const {
+
+ bool includeByDefault() const override {
return true;
}
- virtual BSONObj generateSection(OperationContext* opCtx,
- const BSONElement& configElement) const {
+ BSONObj generateSection(OperationContext* opCtx,
+ const BSONElement& configElement) const override {
long long verbosity = 1;
if (configElement) {
// Relies on the fact that safeNumberLong turns non-numbers into 0.
@@ -228,5 +228,5 @@ private:
}
#endif
} tcmallocServerStatusSection;
-}
-}
+} // namespace
+} // namespace mongo
View Lorry Controller Status