SERVER-23130 rename readOnly flag to querableBackupMode and hide it

6 files changed, 16 insertions, 14 deletions

diff --git a/jstests/noPassthrough/read_only_command_line.js b/jstests/noPassthrough/read_only_command_line.js
index f3cbed2429f..7e803ea49be 100644
--- a/jstests/noPassthrough/read_only_command_line.js
+++ b/jstests/noPassthrough/read_only_command_line.js
@@ -15,7 +15,7 @@
     MongoRunner.stopMongod(mongod);
 
     mongod = MongoRunner.runMongod(
-        {storageEngine: "mmapv1", readOnly: "", dbpath: dbpath, noCleanData: true});
+        {storageEngine: "mmapv1", queryableBackupMode: "", dbpath: dbpath, noCleanData: true});
     assert(mongod.getDB("admin").isMaster().readOnly);
     assert(mongod.getDB("admin").serverStatus().storageEngine.readOnly);
     MongoRunner.stopMongod(mongod);
diff --git a/jstests/readonly/lib/read_only_test.js b/jstests/readonly/lib/read_only_test.js
index c0ee79a7370..0b9b1d44398 100644
--- a/jstests/readonly/lib/read_only_test.js
+++ b/jstests/readonly/lib/read_only_test.js
@@ -32,7 +32,7 @@ StandaloneFixture.prototype.runExecPhase = function runExecPhase(test) {
         makeDirectoryReadOnly(this.dbpath);
 
         var options = {
-            readOnly: "",
+            queryableBackupMode: "",
             noCleanData: true,
             dbpath: this.dbpath
         };
@@ -73,7 +73,7 @@ ShardedFixture.prototype.runExecPhase = function runExecPhase(test) {
     try {
         for (var i = 0; i < this.nShards; ++i) {
             var opts = {
-                readOnly: "",
+                queryableBackupMode: "",
                 dbpath: this.paths[i]
             };
 
diff --git a/src/mongo/db/mongod_options.cpp b/src/mongo/db/mongod_options.cpp
index 1628b9737a0..efaa9f1efe8 100644
--- a/src/mongo/db/mongod_options.cpp
+++ b/src/mongo/db/mongod_options.cpp
@@ -205,11 +205,12 @@ Status addMongodOptions(moe::OptionSection* options) {
                                       "each database will be stored in a separate directory");
 
     storage_options.addOptionChaining(
-                        "storage.readOnly",
-                        "readOnly",
+                        "storage.queryableBackupMode",
+                        "queryableBackupMode",
                         moe::Switch,
                         "enable read-only mode - if true the server will not accept writes.")
-        .setSources(moe::SourceAll);
+        .setSources(moe::SourceAll)
+        .hidden();
 
 
     general_options.addOptionChaining(
@@ -657,8 +658,8 @@ Status validateMongodOptions(const moe::Environment& params) {
     }
 #endif
 
-    if (params.count("storage.readOnly")) {
-        // Command line options that are disallowed when --readOnly is specified.
+    if (params.count("storage.queryableBackupMode")) {
+        // Command line options that are disallowed when --queryableBackupMode is specified.
         for (const auto& disallowedOption : {"replSet",
                                              "configSvr",
                                              "upgrade",
@@ -676,7 +677,7 @@ Status validateMongodOptions(const moe::Environment& params) {
                                              "fastsync"}) {
             if (params.count(disallowedOption)) {
                 return Status(ErrorCodes::BadValue,
-                              str::stream() << "Cannot specify both --readOnly and --"
+                              str::stream() << "Cannot specify both --queryableBackupMode and --"
                                             << disallowedOption);
             }
         }
@@ -1049,7 +1050,8 @@ Status storeMongodOptions(const moe::Environment& params, const std::vector<std:
         storageGlobalParams.directoryperdb = params["storage.directoryPerDB"].as<bool>();
     }
 
-    if (params.count("storage.readOnly") && params["storage.readOnly"].as<bool>()) {
+    if (params.count("storage.queryableBackupMode") &&
+        params["storage.queryableBackupMode"].as<bool>()) {
         storageGlobalParams.readOnly = true;
         storageGlobalParams.dur = false;
     }
diff --git a/src/mongo/db/storage/mmap_v1/mmap_v1_database_catalog_entry.cpp b/src/mongo/db/storage/mmap_v1/mmap_v1_database_catalog_entry.cpp
index 4f97ed08f4c..306a8e26b67 100644
--- a/src/mongo/db/storage/mmap_v1/mmap_v1_database_catalog_entry.cpp
+++ b/src/mongo/db/storage/mmap_v1/mmap_v1_database_catalog_entry.cpp
@@ -476,7 +476,7 @@ void MMAPV1DatabaseCatalogEntry::_init(OperationContext* txn) {
     if (freeListDetails) {
         if (storageGlobalParams.readOnly) {
             severe() << "Legacy storage format detected, but server was started with the "
-                        "--readOnly command line parameter.";
+                        "--queryableBackupMode command line parameter.";
             fassertFailedNoTrace(34373);
         }
 
@@ -492,7 +492,7 @@ void MMAPV1DatabaseCatalogEntry::_init(OperationContext* txn) {
     if (version.isCompatibleWithCurrentCode() && !version.mayHave28Freelist()) {
         if (storageGlobalParams.readOnly) {
             severe() << "Legacy storage format detected, but server was started with the "
-                        "--readOnly command line parameter.";
+                        "--queryableBackupMode command line parameter.";
             fassertFailedNoTrace(34374);
         }
 
diff --git a/src/mongo/db/storage/storage_engine_lock_file_posix.cpp b/src/mongo/db/storage/storage_engine_lock_file_posix.cpp
index acbec3fdd8e..de9e0bb97aa 100644
--- a/src/mongo/db/storage/storage_engine_lock_file_posix.cpp
+++ b/src/mongo/db/storage/storage_engine_lock_file_posix.cpp
@@ -105,7 +105,7 @@ Status StorageEngineLockFile::open() {
             return Status(ErrorCodes::IllegalOperation,
                           str::stream()
                               << "Attempted to create a lock file on a read-only directory: "
-                              << _dbpath << " - did you mean to start with --readOnly?");
+                              << _dbpath);
         }
         return Status(ErrorCodes::DBPathInUse,
                       str::stream() << "Unable to create/open lock file: " << _filespec << ' '
diff --git a/src/mongo/db/storage/storage_engine_lock_file_windows.cpp b/src/mongo/db/storage/storage_engine_lock_file_windows.cpp
index b303606672d..dfac9d024bd 100644
--- a/src/mongo/db/storage/storage_engine_lock_file_windows.cpp
+++ b/src/mongo/db/storage/storage_engine_lock_file_windows.cpp
@@ -126,7 +126,7 @@ Status StorageEngineLockFile::open() {
             return Status(ErrorCodes::IllegalOperation,
                           str::stream()
                               << "Attempted to create a lock file on a read-only directory: "
-                              << _dbpath << " - did you mean to start with --readOnly?");
+                              << _dbpath);
         }
         return Status(ErrorCodes::DBPathInUse,
                       str::stream() << "Unable to create/open lock file: " << _filespec << ' '