SERVER-32065 support retryWrites URI param in shell

2 files changed, 10 insertions, 5 deletions

diff --git a/src/mongo/shell/dbshell.cpp b/src/mongo/shell/dbshell.cpp
index 4dfb85d835a..83e07975a68 100644
--- a/src/mongo/shell/dbshell.cpp
+++ b/src/mongo/shell/dbshell.cpp
@@ -784,10 +784,11 @@ int _main(int argc, char* argv[], char** envp) {
            << getURIFromArgs(processedURI, shellGlobalParams.dbhost, shellGlobalParams.port)
            << "\");";
 
-        if (shellGlobalParams.shouldRetryWrites) {
-            // If the user specified --retryWrites to the mongo shell, then we replace the global
-            // `db` object with a DB object that has retryable writes enabled.
-            ss << "db = db.getMongo().startSession({retryWrites: true}).getDatabase(db.getName());";
+        if (shellGlobalParams.shouldRetryWrites || parsedURI.getRetryWrites()) {
+            // If the --retryWrites cmdline argument or retryWrites URI param was specified, then
+            // replace the global `db` object with a DB object started in a session. The resulting
+            // Mongo connection checks its _retryWrites property.
+            ss << "db = db.getMongo().startSession().getDatabase(db.getName());";
         }
 
         mongo::shell_utils::_dbConnect = ss.str();
diff --git a/src/mongo/shell/mongo.js b/src/mongo/shell/mongo.js
index 2a477659eb8..e789e284795 100644
--- a/src/mongo/shell/mongo.js
+++ b/src/mongo/shell/mongo.js
@@ -417,7 +417,11 @@ Mongo.prototype.getClusterTime = function() {
     return this._clusterTime;
 };
 
-Mongo.prototype.startSession = function startSession(options) {
+Mongo.prototype.startSession = function startSession(options = {}) {
+    // Set retryWrites if not already set on options.
+    if (!options.hasOwnProperty("retryWrites") && this.hasOwnProperty("_retryWrites")) {
+        options.retryWrites = this._retryWrites;
+    }
     return new DriverSession(this, options);
 };