diff options
-rw-r--r-- | buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml | 1 | ||||
-rw-r--r-- | buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml | 1 | ||||
-rw-r--r-- | jstests/core/index_bigkeys_validation.js | 28 | ||||
-rw-r--r-- | jstests/libs/parallelTester.js | 5 | ||||
-rw-r--r-- | src/mongo/db/catalog/collection.cpp | 31 | ||||
-rw-r--r-- | src/mongo/db/commands/validate.cpp | 17 | ||||
-rw-r--r-- | src/mongo/db/index/index_access_method.h | 3 | ||||
-rw-r--r-- | src/mongo/db/storage/record_store.h | 1 |
8 files changed, 14 insertions, 73 deletions
diff --git a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml index c8aa4df0857..6b51a5f17f5 100644 --- a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml @@ -25,7 +25,6 @@ selector: - jstests/core/geo_s2cursorlimitskip.js # profiling. - jstests/core/geo_update_btree2.js # notablescan. - jstests/core/index_bigkeys_nofail.js # failIndexKeyTooLong. - - jstests/core/index_bigkeys_validation.js # failIndexKeyTooLong. - jstests/core/max_time_ms.js # sleep, SERVER-2212. - jstests/core/mr_replaceIntoDB.js # MapReduceResult, SERVER-20495. - jstests/core/notablescan.js # notablescan. diff --git a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml index f217b513534..56a5b581ce8 100644 --- a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml @@ -24,7 +24,6 @@ selector: - jstests/core/geo_s2cursorlimitskip.js # profiling. - jstests/core/geo_update_btree2.js # notablescan. - jstests/core/index_bigkeys_nofail.js # failIndexKeyTooLong. - - jstests/core/index_bigkeys_validation.js # failIndexKeyTooLong. - jstests/core/max_time_ms.js # sleep, SERVER-2212. - jstests/core/notablescan.js # notablescan. - jstests/core/profile*.js # profiling. diff --git a/jstests/core/index_bigkeys_validation.js b/jstests/core/index_bigkeys_validation.js deleted file mode 100644 index 88e2816fc8d..00000000000 --- a/jstests/core/index_bigkeys_validation.js +++ /dev/null @@ -1,28 +0,0 @@ -// Tests that index validation succeeds for long keys when failIndexKeyTooLong is set to false. -// See: SERVER-22234 -'use strict'; - -(function() { - var coll = db.longindex; - coll.drop(); - - var longVal = new Array(1025).join('x'); // Keys >= 1024 bytes cannot be indexed. - - assert.commandWorked(db.adminCommand({setParameter: 1, failIndexKeyTooLong: false})); - - assert.writeOK(coll.insert({_id: longVal})); - // Verify that validation succeeds when the failIndexKeyTooLong parameter is set to false, - // even when there are fewer index keys than documents. - var res = coll.validate({full: true, scandata: true}); - assert.commandWorked(res); - assert(res.valid, tojson(res)); - - // Change failIndexKeyTooLong back to the default value. - assert.commandWorked(db.adminCommand({setParameter: 1, failIndexKeyTooLong: true})); - - // Verify that validation fails when the failIndexKeyTooLong parameter is - // reverted to its old value and there are mismatched index keys and documents. - res = coll.validate({full: true, scandata: true}); - assert.commandWorked(res); - assert.eq(res.valid, false, tojson(res)); -})(); diff --git a/jstests/libs/parallelTester.js b/jstests/libs/parallelTester.js index 39035731449..743d15b9825 100644 --- a/jstests/libs/parallelTester.js +++ b/jstests/libs/parallelTester.js @@ -115,10 +115,9 @@ if (typeof _threadInject != "undefined") { "extent.js", "indexb.js", - // Tests that set a parameter that causes the server to ignore - // long index keys. + // sets a failpoint that causes the server to ignore long keys, + // which makes index_bigkeys.js fail "index_bigkeys_nofail.js", - "index_bigkeys_validation.js", // tests turn on profiling "profile1.js", diff --git a/src/mongo/db/catalog/collection.cpp b/src/mongo/db/catalog/collection.cpp index c3ea2c0ed80..596c80d396b 100644 --- a/src/mongo/db/catalog/collection.cpp +++ b/src/mongo/db/catalog/collection.cpp @@ -54,7 +54,6 @@ #include "mongo/db/ops/update_driver.h" #include "mongo/db/ops/update_request.h" #include "mongo/db/repl/replication_coordinator_global.h" -#include "mongo/db/server_parameters.h" #include "mongo/db/service_context.h" #include "mongo/db/storage/mmap_v1/mmap_v1_options.h" #include "mongo/db/storage/record_fetcher.h" @@ -927,17 +926,11 @@ void validateIndexKeyCount(OperationContext* txn, int64_t numRecs, ValidateResults* results) { if (idx.isIdIndex() && numIdxKeys != numRecs) { - string msg = str::stream() << "number of _id index entries (" << numIdxKeys + string err = str::stream() << "number of _id index entries (" << numIdxKeys << ") does not match the number of documents (" << numRecs << ")"; - - if (!failIndexKeyTooLong && (numIdxKeys < numRecs)) { - results->warnings.push_back(msg); - } else { - results->errors.push_back(msg); - results->valid = false; - } - + results->errors.push_back(err); + results->valid = false; return; // Avoid failing the next two checks, they just add redundant/confusing messages } if (!idx.isMultikey(txn) && numIdxKeys > numRecs) { @@ -951,16 +944,11 @@ void validateIndexKeyCount(OperationContext* txn, // index plugin with different semantics. if (!idx.isSparse() && !idx.isPartial() && idx.getAccessMethodName() == "" && numIdxKeys < numRecs) { - string msg = str::stream() << "index " << idx.indexName() + string err = str::stream() << "index " << idx.indexName() << " is not sparse or partial, but has fewer entries (" << numIdxKeys << ") than documents (" << numRecs << ")"; - - if (!failIndexKeyTooLong) { - results->warnings.push_back(msg); - } else { - results->errors.push_back(msg); - results->valid = false; - } + results->errors.push_back(err); + results->valid = false; } } } // namespace @@ -978,13 +966,6 @@ Status Collection::validate(OperationContext* txn, return status; { // indexes - if (!failIndexKeyTooLong) { - string warning = - "The server is configured with the failIndexKeyTooLong parameter set to false. " - "Validation failures that result from having fewer index entries than documents " - "have been downgraded from errors to warnings"; - results->warnings.push_back(warning); - } output->append("nIndexes", _indexCatalog.numIndexesReady(txn)); int idxn = 0; try { diff --git a/src/mongo/db/commands/validate.cpp b/src/mongo/db/commands/validate.cpp index 93693e68c57..41d5b4afdb8 100644 --- a/src/mongo/db/commands/validate.cpp +++ b/src/mongo/db/commands/validate.cpp @@ -107,22 +107,17 @@ public: if (!status.isOK()) return appendCommandStatus(result, status); + result.appendBool("valid", results.valid); + result.append("errors", results.errors); + if (!full) { - results.warnings.push_back( + result.append( + "warning", "Some checks omitted for speed. use {full:true} option to do more thorough scan."); } - result.appendBool("valid", results.valid); - result.append("warnings", results.warnings); - result.append("errors", results.errors); - if (!results.valid) { - result.append("advice", - "A corrupt namespace has been detected. See " - "http://dochub.mongodb.org/core/data-recovery for recovery steps. Note " - "that validation failures may also result from running a server with the " - "failIndexKeyTooLong parameter set to false and later disabling the " - "parameter."); + result.append("advice", "ns corrupt. See http://dochub.mongodb.org/core/data-recovery"); } return true; diff --git a/src/mongo/db/index/index_access_method.h b/src/mongo/db/index/index_access_method.h index ea9ea90c71c..df62c4ae937 100644 --- a/src/mongo/db/index/index_access_method.h +++ b/src/mongo/db/index/index_access_method.h @@ -28,7 +28,6 @@ #pragma once -#include <atomic> #include <memory> #include "mongo/base/disallow_copying.h" @@ -41,8 +40,6 @@ namespace mongo { -extern std::atomic<bool> failIndexKeyTooLong; // NOLINT - class BSONObjBuilder; class MatchExpression; class UpdateTicket; diff --git a/src/mongo/db/storage/record_store.h b/src/mongo/db/storage/record_store.h index 2beb8368bf4..b6e973a16ab 100644 --- a/src/mongo/db/storage/record_store.h +++ b/src/mongo/db/storage/record_store.h @@ -604,7 +604,6 @@ struct ValidateResults { } bool valid; std::vector<std::string> errors; - std::vector<std::string> warnings; }; /** |