diff options
| author | Randolph Tan <randolph@10gen.com> | 2015-12-01 17:25:43 -0500 |
|---|---|---|
| committer | Randolph Tan <randolph@10gen.com> | 2015-12-16 17:44:43 -0500 |
| commit | cac4b59579191300d46eefcb786ce0382aa68817 (patch) | |
| tree | ddc7a47d9bf22a5084a317c603fd4c3f3a49bb3d | |
| parent | 8315d63e306131214f2fdae77fff956271805a1c (diff) | |
| download | mongo-cac4b59579191300d46eefcb786ce0382aa68817.tar.gz | |
SERVER-19266 An error document is returned with result set
Make sure that the error result flag is set when receiving one from of the shards during GET_MORE.
(cherry picked from commit eb79bd1fe807512e54c68c5982b2a24fa1d66bba)
Conflicts:
src/mongo/client/parallel.cpp
| -rw-r--r-- | src/mongo/client/parallel.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mongo/client/parallel.cpp b/src/mongo/client/parallel.cpp index 8ef983abc53..30cee0d99e7 100644 --- a/src/mongo/client/parallel.cpp +++ b/src/mongo/client/parallel.cpp @@ -1527,6 +1527,11 @@ namespace mongo { if ( comp < 0 ) continue; + uassert(28841, + str::stream() << "server " << _cursors[i].raw()->originalHost() + << " returned an error: " << me, + !_cursors[i].raw()->hasResultFlag(ResultFlag_ErrSet)); + best = me; bestFrom = i; } |