Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 6 insertions, 5 deletions

diff --git a/src/mongo/db/s/split_vector_command.cpp b/src/mongo/db/s/split_vector_command.cpp
index 2fc9963b133..b485c08361c 100644
--- a/src/mongo/db/s/split_vector_command.cpp
+++ b/src/mongo/db/s/split_vector_command.cpp
@@ -137,16 +137,17 @@ public:
                 // Prevent maxChunkSizeBytes overflow. Check aimed to avoid fuzzer failures
                 // since users are definitely not expected to specify maxChunkSize in exabytes.
                 uassert(ErrorCodes::InvalidOptions,
-                        str::stream() << "maxChunkSize must lie within the range [1MB, 1024MB]",
-                        maxChunkSizeMB >= 1 && maxChunkSizeMB <= 1024);
+                        str::stream()
+                            << "The specified maxChunkSize in MB is too big: " << maxChunkSizeMB,
+                        maxChunkSizeMB <= (LLONG_MAX >> 20));
                 ret = maxChunkSizeMB << 20;
             } else if (maxSizeBytesElem.isNumber()) {
                 ret = maxSizeBytesElem.safeNumberLong();
-                uassert(ErrorCodes::InvalidOptions,
-                        "The specified max chunk size must lie within the range [1MB, 1024MB]",
-                        *ret >= 1024 * 1024 && *ret <= 1024 * 1024 * 1024);
             }
 
+            uassert(ErrorCodes::InvalidOptions,
+                    "The specified max chunk size must be at least 1MB",
+                    ret == boost::none || *ret >= 1024 * 1024);
             return ret;
         }();