summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpencer Jackson <spencer.jackson@mongodb.com>2022-09-13 15:51:30 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-10-12 23:25:47 +0000
commit37f2a3b703361f68d3edf9036fbf0233c95d6ca3 (patch)
treed7bf3929852fdb965296e1f7c504fd2cc063fe76
parentef583d809bd2f95b83450c60b225e957fe9eb50c (diff)
downloadmongo-37f2a3b703361f68d3edf9036fbf0233c95d6ca3.tar.gz
SERVER-69348 Remove repairDatabase command
(cherry picked from commit fa534d676f5f673a6a7f3ea656f650ff108b7f92) (cherry picked from commit 49297c3cb0cdae29b0c1da41c6ea802731090a24) (cherry picked from commit 1e2dcf8746047e0e194170a22bc1a4a82e1c9b8f)
-rw-r--r--etc/backports_required_for_multiversion_tests.yml6
-rw-r--r--jstests/core/views/views_all_commands.js1
-rw-r--r--jstests/replsets/db_reads_while_recovering_all_commands.js1
-rw-r--r--src/mongo/db/commands/dbcommands.cpp35
-rw-r--r--src/mongo/embedded/mongo_embedded/mongo_embedded_test.cpp2
5 files changed, 7 insertions, 38 deletions
diff --git a/etc/backports_required_for_multiversion_tests.yml b/etc/backports_required_for_multiversion_tests.yml
index 3bd7b9aa2ba..9dc3e879112 100644
--- a/etc/backports_required_for_multiversion_tests.yml
+++ b/etc/backports_required_for_multiversion_tests.yml
@@ -152,6 +152,12 @@ all:
test_file: jstests/sharding/shard_collection_basic.js
- ticket: SERVER-68115
test_file: jstests/core/elemmatch_index.js
+ - ticket: SERVER-69348
+ test_file: jstests/core/views/views_all_commands.js
+ - ticket: SERVER-69348
+ test_file: jstests/replsets/db_reads_while_recovering_all_commands.js
+ - ticket: SERVER-69348
+ test_file: jstests/sharding/read_write_concern_defaults_application.js
# Tests that should only be excluded from particular suites should be listed under that suite.
suites:
diff --git a/jstests/core/views/views_all_commands.js b/jstests/core/views/views_all_commands.js
index 345c408e321..3d1411716dc 100644
--- a/jstests/core/views/views_all_commands.js
+++ b/jstests/core/views/views_all_commands.js
@@ -428,7 +428,6 @@ let viewsCommandTests = {
}
],
repairCursor: {command: {repairCursor: "view"}, expectFailure: true},
- repairDatabase: {skip: isUnrelated},
repairShardedCollectionChunksHistory: {
command: {repairShardedCollectionChunksHistory: "test.view"},
skipStandalone: true,
diff --git a/jstests/replsets/db_reads_while_recovering_all_commands.js b/jstests/replsets/db_reads_while_recovering_all_commands.js
index 37ed95f1015..125883a697d 100644
--- a/jstests/replsets/db_reads_while_recovering_all_commands.js
+++ b/jstests/replsets/db_reads_while_recovering_all_commands.js
@@ -251,7 +251,6 @@ const allCommands = {
refreshSessions: {skip: isNotAUserDataRead},
reIndex: {skip: isNotAUserDataRead},
renameCollection: {skip: isPrimaryOnly},
- repairDatabase: {skip: isNotAUserDataRead},
repairShardedCollectionChunksHistory: {skip: isPrimaryOnly},
repairCursor: {skip: isNotAUserDataRead},
replSetAbortPrimaryCatchUp: {skip: isNotAUserDataRead},
diff --git a/src/mongo/db/commands/dbcommands.cpp b/src/mongo/db/commands/dbcommands.cpp
index d9c6fba2042..228b206da51 100644
--- a/src/mongo/db/commands/dbcommands.cpp
+++ b/src/mongo/db/commands/dbcommands.cpp
@@ -165,41 +165,6 @@ public:
} cmdDropDatabase;
-static const char* repairRemovedMessage =
- "This command has been removed. If you would like to compact your data, use the 'compact' "
- "command. If you would like to rebuild indexes, use the 'reIndex' command. If you need to "
- "recover data, please see the documentation for repairing your database offline: "
- "http://dochub.mongodb.org/core/repair";
-
-class CmdRepairDatabase : public ErrmsgCommandDeprecated {
-public:
- AllowedOnSecondary secondaryAllowed(ServiceContext*) const override {
- return AllowedOnSecondary::kAlways;
- }
- virtual bool maintenanceMode() const {
- return false;
- }
-
- std::string help() const override {
- return repairRemovedMessage;
- }
- virtual bool supportsWriteConcern(const BSONObj& cmd) const override {
- return false;
- }
-
- CmdRepairDatabase() : ErrmsgCommandDeprecated("repairDatabase") {}
-
- bool errmsgRun(OperationContext* opCtx,
- const string& dbname,
- const BSONObj& cmdObj,
- string& errmsg,
- BSONObjBuilder& result) {
-
- uasserted(ErrorCodes::CommandNotFound, repairRemovedMessage);
- return false;
- }
-} cmdRepairDatabase;
-
/* drop collection */
class CmdDrop : public ErrmsgCommandDeprecated {
public:
diff --git a/src/mongo/embedded/mongo_embedded/mongo_embedded_test.cpp b/src/mongo/embedded/mongo_embedded/mongo_embedded_test.cpp
index 3a52cc81f5c..9930c00fd1c 100644
--- a/src/mongo/embedded/mongo_embedded/mongo_embedded_test.cpp
+++ b/src/mongo/embedded/mongo_embedded/mongo_embedded_test.cpp
@@ -592,7 +592,6 @@ TEST_F(MongodbCAPITest, RunListCommands) {
"refreshSessions",
"renameCollection",
"repairCursor",
- "repairDatabase",
"resetError",
"serverStatus",
"setParameter",
@@ -602,6 +601,7 @@ TEST_F(MongodbCAPITest, RunListCommands) {
"validate",
"waitForFailPoint",
};
+
std::sort(whitelist.begin(), whitelist.end());
mongo::BSONObj listCommandsObj = mongo::fromjson("{ listCommands: 1 }");