summaryrefslogtreecommitdiff
path: root/src/mongo/s/client/parallel.cpp
diff options
context:
space:
mode:
authorKaloian Manassiev <kaloian.manassiev@mongodb.com>2018-06-22 15:21:18 -0400
committerKaloian Manassiev <kaloian.manassiev@mongodb.com>2018-06-27 15:19:13 -0400
commit60559a00b81293184922b3418a8e56610edf8dd9 (patch)
tree4d74eaf849b70303f26aeb5ee91742e45a1a39b4 /src/mongo/s/client/parallel.cpp
parente7a75ec01e4e3683cc6b83e3bbc0f4c4b05168dc (diff)
downloadmongo-60559a00b81293184922b3418a8e56610edf8dd9.tar.gz
SERVER-32198 Add support for an optional `vWanted` to StaleConfigInfo
Diffstat (limited to 'src/mongo/s/client/parallel.cpp')
-rw-r--r--src/mongo/s/client/parallel.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/mongo/s/client/parallel.cpp b/src/mongo/s/client/parallel.cpp
index d4bfddd22df..62d9425ba35 100644
--- a/src/mongo/s/client/parallel.cpp
+++ b/src/mongo/s/client/parallel.cpp
@@ -612,12 +612,8 @@ void ParallelSortClusteredCursor::startInit(OperationContext* opCtx) {
// Our version isn't compatible with the current version anymore on at least one shard,
// need to retry immediately
NamespaceString staleNS(e->getNss());
-
- // For legacy reasons, this may not be set in the exception :-(
- if (staleNS.size() == 0)
- staleNS = nss; // ns is the *versioned* namespace, be careful of this
-
_markStaleNS(staleNS, e);
+
Grid::get(opCtx)->catalogCache()->invalidateShardedCollection(staleNS);
LOG(1) << "stale config of ns " << staleNS << " during initialization, will retry"
@@ -768,10 +764,6 @@ void ParallelSortClusteredCursor::finishInit(OperationContext* opCtx) {
std::string staleNS = e->getNss().ns();
- // For legacy reasons, ns may not always be set in exception :-(
- if (staleNS.size() == 0)
- staleNS = ns; // ns is versioned namespace, be careful of this
-
// Will retry all at once
staleNSExceptions.emplace(staleNS, e);