SERVER-50662 Handle large and non-finite doubles in FTDC

3 files changed, 61 insertions, 1 deletions

diff --git a/src/mongo/db/ftdc/compressor_test.cpp b/src/mongo/db/ftdc/compressor_test.cpp
index 509504037b7..f8dee52f889 100644
--- a/src/mongo/db/ftdc/compressor_test.cpp
+++ b/src/mongo/db/ftdc/compressor_test.cpp
@@ -170,6 +170,11 @@ public:
         ValidateDocumentList(list, _docs, _mode);
     }
 
+    void setExpectedDocuments(const std::vector<BSONObj>& docs) {
+        _docs.clear();
+        std::copy(docs.begin(), docs.end(), std::back_inserter(_docs));
+    }
+
 private:
     std::vector<BSONObj> _docs;
     FTDCConfig _config;
@@ -537,4 +542,40 @@ TEST_F(FTDCCompressorTest, TestManyMetrics) {
     }
 }
 
+// Test various non-finite double values
+TEST_F(FTDCCompressorTest, TestDoubleValues) {
+    TestTie c;
+
+    auto st = c.addSample(BSON("d" << 0.0));
+    ASSERT_HAS_SPACE(st);
+    st = c.addSample(BSON("d" << -42.0));
+    ASSERT_HAS_SPACE(st);
+    st = c.addSample(BSON("d" << 42.0));
+    ASSERT_HAS_SPACE(st);
+    st = c.addSample(BSON("d" << std::numeric_limits<double>::max()));
+    ASSERT_HAS_SPACE(st);
+    st = c.addSample(BSON("d" << std::numeric_limits<double>::min()));
+    ASSERT_HAS_SPACE(st);
+    st = c.addSample(BSON("d" << std::numeric_limits<double>::lowest()));
+    ASSERT_HAS_SPACE(st);
+    st = c.addSample(BSON("d" << std::numeric_limits<double>::infinity()));
+    ASSERT_HAS_SPACE(st);
+    st = c.addSample(BSON("d" << -std::numeric_limits<double>::infinity()));
+    ASSERT_HAS_SPACE(st);
+    st = c.addSample(BSON("d" << std::numeric_limits<double>::quiet_NaN()));
+    ASSERT_HAS_SPACE(st);
+
+    c.setExpectedDocuments({
+        BSON("d" << 0.0),
+        BSON("d" << -42.0),
+        BSON("d" << 42.0),
+        BSON("d" << std::numeric_limits<long long>::max()),
+        BSON("d" << 0),
+        BSON("d" << std::numeric_limits<long long>::min()),
+        BSON("d" << std::numeric_limits<long long>::max()),
+        BSON("d" << std::numeric_limits<long long>::min()),
+        BSON("d" << 0),
+    });
+}
+
 }  // namespace mongo
diff --git a/src/mongo/db/ftdc/util.cpp b/src/mongo/db/ftdc/util.cpp
index 39cf8fa343e..e3b52800c03 100644
--- a/src/mongo/db/ftdc/util.cpp
+++ b/src/mongo/db/ftdc/util.cpp
@@ -222,7 +222,25 @@ StatusWith<bool> extractMetricsFromDocument(const BSONObj& referenceDoc,
             // all numeric types are extracted as long (int64)
             // this supports the loose schema matching mentioned above,
             // but does create a range issue for doubles, and requires doubles to be integer
-            case NumberDouble:
+            // Doubles and Decimal that fall out of the range of int64 are converted to:
+            // NaN -> 0
+            // Inf -> MAX
+            // -Inf -> MIN
+            case NumberDouble: {
+                double value = currentElement.numberDouble();
+                long long newValue = 0;
+                if (std::isnan(value)) {
+                    newValue = 0;
+                } else if (!(value < BSONElement::kLongLongMaxPlusOneAsDouble)) {
+                    newValue = std::numeric_limits<long long>::max();
+                } else if (value < std::numeric_limits<long long>::min()) {
+                    newValue = std::numeric_limits<long long>::min();
+                } else {
+                    newValue = static_cast<long long>(value);
+                }
+                metrics->emplace_back(newValue);
+                break;
+            }
             case NumberInt:
             case NumberLong:
             case NumberDecimal:
diff --git a/src/mongo/shell/kms_aws.cpp b/src/mongo/shell/kms_aws.cpp
index 120613d7538..8cb1741a62c 100644
--- a/src/mongo/shell/kms_aws.cpp
+++ b/src/mongo/shell/kms_aws.cpp
@@ -251,6 +251,7 @@ BSONObj AWSKMSService::encryptDataKey(ConstDataRange cdr, StringData keyId) {
     keyAndMaterial.setKeyMaterial(dataKey);
     keyAndMaterial.setMasterKey(masterKey);
 
+
     return keyAndMaterial.toBSON();
 }