summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Benvenuto <mark.benvenuto@mongodb.com>2018-03-12 17:06:10 -0400
committerMark Benvenuto <mark.benvenuto@mongodb.com>2018-03-12 17:06:10 -0400
commitfd954412dfc10e4d1e3e2dd4fac040f8b476b268 (patch)
treec71284d4152d4785e1dd173bbe336d90c666f389
parentba7e3424c4c3dadd3bc8cc16214e2d12e93043e9 (diff)
downloadmongo-r3.4.14.tar.gz
SERVER-28495 Fix lintr3.4.14-rc0r3.4.14
-rw-r--r--src/mongo/db/ftdc/ftdc_server.cpp10
-rw-r--r--src/mongo/s/commands/cluster_ftdc_commands.cpp3
2 files changed, 7 insertions, 6 deletions
diff --git a/src/mongo/db/ftdc/ftdc_server.cpp b/src/mongo/db/ftdc/ftdc_server.cpp
index 06bc937be42..167587a8722 100644
--- a/src/mongo/db/ftdc/ftdc_server.cpp
+++ b/src/mongo/db/ftdc/ftdc_server.cpp
@@ -60,7 +60,7 @@ FTDCController* getGlobalFTDCController() {
return getFTDCController(getGlobalServiceContext()).get();
}
-std::atomic<bool> localEnabledFlag(FTDCConfig::kEnabledDefault); // NOLINT
+std::atomic<bool> localEnabledFlag(FTDCConfig::kEnabledDefault); // NOLINT
class ExportedFTDCEnabledParameter
: public ExportedServerParameter<bool, ServerParameterType::kStartupAndRuntime> {
@@ -82,7 +82,7 @@ public:
} exportedFTDCEnabledParameter;
-std::atomic<std::int32_t> localPeriodMillis(FTDCConfig::kPeriodMillisDefault); // NOLINT
+std::atomic<std::int32_t> localPeriodMillis(FTDCConfig::kPeriodMillisDefault); // NOLINT
class ExportedFTDCPeriodParameter
: public ExportedServerParameter<std::int32_t, ServerParameterType::kStartupAndRuntime> {
@@ -111,9 +111,11 @@ public:
} exportedFTDCPeriodParameter;
// Scale the values down since are defaults are in bytes, but the user interface is MB
-std::atomic<std::int32_t> localMaxDirectorySizeMB(FTDCConfig::kMaxDirectorySizeBytesDefault / (1024 * 1024)); // NOLINT
+std::atomic<std::int32_t> localMaxDirectorySizeMB(FTDCConfig::kMaxDirectorySizeBytesDefault /
+ (1024 * 1024)); // NOLINT
-std::atomic<std::int32_t> localMaxFileSizeMB(FTDCConfig::kMaxFileSizeBytesDefault / (1024 * 1024)); // NOLINT
+std::atomic<std::int32_t> localMaxFileSizeMB(FTDCConfig::kMaxFileSizeBytesDefault /
+ (1024 * 1024)); // NOLINT
class ExportedFTDCDirectorySizeParameter
: public ExportedServerParameter<std::int32_t, ServerParameterType::kStartupAndRuntime> {
diff --git a/src/mongo/s/commands/cluster_ftdc_commands.cpp b/src/mongo/s/commands/cluster_ftdc_commands.cpp
index b0055f7d6be..12021e98f6d 100644
--- a/src/mongo/s/commands/cluster_ftdc_commands.cpp
+++ b/src/mongo/s/commands/cluster_ftdc_commands.cpp
@@ -100,8 +100,7 @@ public:
BSONObjBuilder& result) override {
result.append(
- "data",
- FTDCController::get(txn->getServiceContext())->getMostRecentPeriodicDocument());
+ "data", FTDCController::get(txn->getServiceContext())->getMostRecentPeriodicDocument());
return true;
}