summaryrefslogtreecommitdiff
path: root/src/mongo/client/parallel.cpp
diff options
context:
space:
mode:
authorMisha Tyulenev <misha@mongodb.com>2016-03-03 13:39:56 -0500
committerMisha Tyulenev <misha@mongodb.com>2016-03-03 13:40:25 -0500
commitbc196517c4162993edbe6ca3669b9cd70865deec (patch)
tree9bbc44e7875ee29ae3140a8125073ea289d35a5a /src/mongo/client/parallel.cpp
parent9778d0678715fc3f9b9f725cfd11ea85ce03b2fc (diff)
downloadmongo-bc196517c4162993edbe6ca3669b9cd70865deec.tar.gz
SERVER-22318 remove SCCC support
Diffstat (limited to 'src/mongo/client/parallel.cpp')
-rw-r--r--src/mongo/client/parallel.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/mongo/client/parallel.cpp b/src/mongo/client/parallel.cpp
index 43865ac7ff0..37d2622538a 100644
--- a/src/mongo/client/parallel.cpp
+++ b/src/mongo/client/parallel.cpp
@@ -115,7 +115,7 @@ static void throwCursorError(DBClientCursor* cursor) {
ParallelSortClusteredCursor::ParallelSortClusteredCursor(const QuerySpec& qSpec,
const CommandInfo& cInfo)
- : _qSpec(qSpec), _cInfo(cInfo), _totalTries(0), _cmChangeAttempted(false) {
+ : _qSpec(qSpec), _cInfo(cInfo), _totalTries(0) {
_done = false;
_didInit = false;
@@ -688,15 +688,6 @@ void ParallelSortClusteredCursor::startInit(OperationContext* txn) {
}
throw;
} catch (DBException& e) {
- if (e.getCode() == ErrorCodes::IncompatibleCatalogManager) {
- fassert(28792, !_cmChangeAttempted);
- _cmChangeAttempted = true;
-
- grid.forwardingCatalogManager()->waitForCatalogManagerChange(txn);
- startInit(txn);
- return;
- }
-
warning() << "db exception when initializing on " << shardId
<< ", current connection state is " << mdata.toBSON() << causedBy(e);
e._shard = shardId;