summaryrefslogtreecommitdiff
path: root/src/mongo/db/exec
diff options
context:
space:
mode:
authorSam Kleinman <samk@10gen.com>2015-04-27 14:09:20 -0400
committerSam Kleinman <samk@10gen.com>2015-05-12 11:34:04 -0400
commit44c3bfa1e1412886ba48692d4555be87670ba747 (patch)
tree9533d8e65e6f537681494370e302a34400630b76 /src/mongo/db/exec
parent12f532bec72696a7442480d65c2eefecbae04119 (diff)
downloadmongo-44c3bfa1e1412886ba48692d4555be87670ba747.tar.gz
SERVER-18212: edits to sort out of memory error message
Diffstat (limited to 'src/mongo/db/exec')
-rw-r--r--src/mongo/db/exec/sort.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/exec/sort.cpp b/src/mongo/db/exec/sort.cpp
index e2e59a271d9..50b0b6e23c7 100644
--- a/src/mongo/db/exec/sort.cpp
+++ b/src/mongo/db/exec/sort.cpp
@@ -330,9 +330,9 @@ namespace mongo {
const size_t maxBytes = static_cast<size_t>(internalQueryExecMaxBlockingSortBytes);
if (_memUsage > maxBytes) {
mongoutils::str::stream ss;
- ss << "sort stage buffered data usage of " << _memUsage
- << " bytes exceeds internal limit of " << maxBytes << " bytes";
- Status status(ErrorCodes::Overflow, ss);
+ ss << "Sort operation used more than the maximum " << maxBytes
+ << " bytes of RAM. Add an index, or specify a smaller limit.";
+ Status status(ErrorCodes::OperationFailed, ss);
*out = WorkingSetCommon::allocateStatusMember( _ws, status);
return PlanStage::FAILURE;
}