1 files changed, 15 insertions, 0 deletions
diff --git a/src/mongo/db/s/collection_range_deleter.cpp b/src/mongo/db/s/collection_range_deleter.cpp
index 0d0d6021437..ed7c303a041 100644
--- a/src/mongo/db/s/collection_range_deleter.cpp
+++ b/src/mongo/db/s/collection_range_deleter.cpp
@@ -62,6 +62,14 @@
 
 namespace mongo {
 
+MONGO_EXPORT_SERVER_PARAMETER(rangeDeleterBatchSize, int, 0)
+    ->withValidator([](const int& newVal) {
+        if (newVal < 0) {
+            return Status(ErrorCodes::BadValue, "rangeDeleterBatchSize must not be negative");
+        }
+        return Status::OK();
+    });
+
 MONGO_EXPORT_SERVER_PARAMETER(rangeDeleterBatchDelayMS, int, 20)
     ->withValidator([](const int& newVal) {
         if (newVal < 0) {
@@ -108,6 +116,13 @@ boost::optional<Date_t> CollectionRangeDeleter::cleanUpNextRange(
     int maxToDelete,
     CollectionRangeDeleter* forTestOnly) {
 
+    if (maxToDelete <= 0) {
+        maxToDelete = rangeDeleterBatchSize.load();
+        if (maxToDelete <= 0) {
+            maxToDelete = std::max(int(internalQueryExecYieldIterations.load()), 1);
+        }
+    }
+
     StatusWith<int> wrote = 0;
 
     auto range = boost::optional<ChunkRange>(boost::none);