SERVER-45098 test that RWC defaults are correctly applied to commands

1 files changed, 9 insertions, 1 deletions

diff --git a/src/mongo/db/commands.cpp b/src/mongo/db/commands.cpp
index 0df24b22613..b2c5fb809f8 100644
--- a/src/mongo/db/commands.cpp
+++ b/src/mongo/db/commands.cpp
@@ -347,7 +347,8 @@ BSONObj CommandHelpers::appendPassthroughFields(const BSONObj& cmdObjWithPassthr
     return b.obj();
 }
 
-BSONObj CommandHelpers::appendMajorityWriteConcern(const BSONObj& cmdObj) {
+BSONObj CommandHelpers::appendMajorityWriteConcern(const BSONObj& cmdObj,
+                                                   WriteConcernOptions defaultWC) {
     WriteConcernOptions newWC = kMajorityWriteConcern;
 
     if (cmdObj.hasField(kWriteConcernField)) {
@@ -365,6 +366,13 @@ BSONObj CommandHelpers::appendMajorityWriteConcern(const BSONObj& cmdObj) {
                                         WriteConcernOptions::SyncMode::UNSET,
                                         wc["wtimeout"].Number());
         }
+    } else if (!defaultWC.usedDefault) {
+        auto minimumAcceptableWTimeout = newWC.wTimeout;
+        newWC = defaultWC;
+        newWC.wMode = "majority";
+        if (defaultWC.wTimeout < minimumAcceptableWTimeout) {
+            newWC.wTimeout = minimumAcceptableWTimeout;
+        }
     }
 
     // Append all original fields except the writeConcern field to the new command.