summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Rassi <rassi@10gen.com>2014-04-02 02:21:22 -0400
committerJason Rassi <rassi@10gen.com>2014-04-02 02:26:41 -0400
commit65b84b79e5bb514e658065d5d9028b85061deae6 (patch)
treedcf0dc9ccdbadf4fe03932e2c5f00126eb2b7e40
parent91e679c2102b2870cfc0b2eeb31035eabc234deb (diff)
downloadmongo-65b84b79e5bb514e658065d5d9028b85061deae6.tar.gz
SERVER-12242 SERVER-12244 Fix typo in compact/reIndex error messages
The error messages originally were incorrectly swapped with one another. (cherry picked from commit df0236cab083063fd125e289c6bac6b017bc6b67)
-rw-r--r--src/mongo/db/commands/drop_indexes.cpp3
-rw-r--r--src/mongo/db/structure/collection_compact.cpp5
2 files changed, 3 insertions, 5 deletions
diff --git a/src/mongo/db/commands/drop_indexes.cpp b/src/mongo/db/commands/drop_indexes.cpp
index 1acb5da063e..0f2fdce6dc5 100644
--- a/src/mongo/db/commands/drop_indexes.cpp
+++ b/src/mongo/db/commands/drop_indexes.cpp
@@ -227,8 +227,7 @@ namespace mongo {
const Status keyStatus = validateKeyPattern(key);
if (!keyStatus.isOK()) {
errmsg = str::stream()
- << "Cannot compact collection due to invalid index " << spec << ": "
- << keyStatus.reason()
+ << "Cannot rebuild index " << spec << ": " << keyStatus.reason()
<< " For more info see http://dochub.mongodb.org/core/index-validation";
return false;
}
diff --git a/src/mongo/db/structure/collection_compact.cpp b/src/mongo/db/structure/collection_compact.cpp
index 1c2b356e3bc..68fd1c49ab3 100644
--- a/src/mongo/db/structure/collection_compact.cpp
+++ b/src/mongo/db/structure/collection_compact.cpp
@@ -255,9 +255,8 @@ namespace mongo {
if (!keyStatus.isOK()) {
return StatusWith<CompactStats>(
ErrorCodes::CannotCreateIndex,
- str::stream() << "Cannot rebuild index " << spec << ": "
- << keyStatus.reason()
- << " For more info see"
+ str::stream() << "Cannot compact collection due to invalid index "
+ << spec << ": " << keyStatus.reason() << " For more info see"
<< " http://dochub.mongodb.org/core/index-validation");
}
indexSpecs.push_back(spec);