diff options
author | Matthew Russotto <matthew.russotto@10gen.com> | 2017-12-08 16:00:38 -0500 |
---|---|---|
committer | Matthew Russotto <matthew.russotto@10gen.com> | 2017-12-12 12:27:54 -0500 |
commit | 4aa886846c35a8e300892fc61328c0d21182961a (patch) | |
tree | d54933f53b7e5eb40a0e2630014bf1e4b1c7f8b0 | |
parent | 832e02e640ac744895168cc9209d8b5cfbfdfbc5 (diff) | |
download | mongo-4aa886846c35a8e300892fc61328c0d21182961a.tar.gz |
SERVER-32238 Revert erroneous high error codes
(cherry picked from commit d4ded799f08767e2bd7701cd34554fc9b8e54719)
-rw-r--r-- | src/mongo/client/dbclientcursor.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/catalog/coll_mod.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/pipeline/document_source_change_stream.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/pipeline/document_source_change_stream_test.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/repl/sync_tail.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/repl/sync_tail_test.cpp | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/mongo/client/dbclientcursor.cpp b/src/mongo/client/dbclientcursor.cpp index 6de2fc26500..3bae83d91b2 100644 --- a/src/mongo/client/dbclientcursor.cpp +++ b/src/mongo/client/dbclientcursor.cpp @@ -242,7 +242,7 @@ void DBClientCursor::requestMore() { /** with QueryOption_Exhaust, the server just blasts data at us (marked at end with cursorid==0). */ void DBClientCursor::exhaustReceiveMore() { verify(cursorId && batch.pos == batch.objs.size()); - uassert(50657, "Cannot have limit for exhaust query", !haveLimit); + uassert(40675, "Cannot have limit for exhaust query", !haveLimit); Message response; verify(_client); if (!_client->recv(response, _lastRequestId)) { diff --git a/src/mongo/db/catalog/coll_mod.cpp b/src/mongo/db/catalog/coll_mod.cpp index f839c9cc361..baf7e98ed49 100644 --- a/src/mongo/db/catalog/coll_mod.cpp +++ b/src/mongo/db/catalog/coll_mod.cpp @@ -442,7 +442,7 @@ Status _collModInternal(OperationContext* opCtx, CollectionCatalogEntry* cce = coll->getCatalogEntry(); cce->removeUUID(opCtx); } else if (uuid && coll->uuid() && uuid.get() != coll->uuid().get()) { - return Status(ErrorCodes::Error(50658), + return Status(ErrorCodes::Error(40676), str::stream() << "collMod " << redact(cmdObj) << " provides a UUID (" << uuid.get().toString() << ") that does not match the UUID (" diff --git a/src/mongo/db/pipeline/document_source_change_stream.cpp b/src/mongo/db/pipeline/document_source_change_stream.cpp index 52b2bdf3164..35046707be6 100644 --- a/src/mongo/db/pipeline/document_source_change_stream.cpp +++ b/src/mongo/db/pipeline/document_source_change_stream.cpp @@ -329,7 +329,7 @@ list<intrusive_ptr<DocumentSource>> DocumentSourceChangeStream::createFromBson( } } if (auto resumeAfterClusterTime = spec.getResumeAfterClusterTime()) { - uassert(50656, + uassert(40674, str::stream() << "Do not specify both " << DocumentSourceChangeStreamSpec::kResumeAfterFieldName << " and " diff --git a/src/mongo/db/pipeline/document_source_change_stream_test.cpp b/src/mongo/db/pipeline/document_source_change_stream_test.cpp index d7ce589deb4..2a7687886e5 100644 --- a/src/mongo/db/pipeline/document_source_change_stream_test.cpp +++ b/src/mongo/db/pipeline/document_source_change_stream_test.cpp @@ -266,7 +266,7 @@ TEST_F(ChangeStreamStageTest, ShouldRejectBothResumeAfterClusterTimeAndResumeAft .firstElement(), expCtx), AssertionException, - 50656); + 40674); } TEST_F(ChangeStreamStageTestNoSetup, FailsWithNoReplicationCoordinator) { diff --git a/src/mongo/db/repl/sync_tail.cpp b/src/mongo/db/repl/sync_tail.cpp index 348479bea5f..45f400e2647 100644 --- a/src/mongo/db/repl/sync_tail.cpp +++ b/src/mongo/db/repl/sync_tail.cpp @@ -1529,7 +1529,7 @@ StatusWith<OpTime> multiApply(OperationContext* opCtx, pinningTransaction = std::unique_ptr<RecoveryUnit>( opCtx->getServiceContext()->getGlobalStorageEngine()->newRecoveryUnit()); pinningTransaction->beginUnitOfWork(opCtx); - fassertStatusOK(50659, pinningTransaction->setTimestamp(ops.front().getTimestamp())); + fassertStatusOK(40677, pinningTransaction->setTimestamp(ops.front().getTimestamp())); } // We must wait for the all work we've dispatched to complete before leaving this block diff --git a/src/mongo/db/repl/sync_tail_test.cpp b/src/mongo/db/repl/sync_tail_test.cpp index 6eba9cbc80a..24c7f27118d 100644 --- a/src/mongo/db/repl/sync_tail_test.cpp +++ b/src/mongo/db/repl/sync_tail_test.cpp @@ -1577,7 +1577,7 @@ TEST_F(SyncTailTest, FailOnAssigningUUIDToCollectionWithExistingUUID) { boost::none, boost::none); - ASSERT_EQUALS(runOpInitialSync(collModOp), ErrorCodes::duplicateCodeForTest(50658)); + ASSERT_EQUALS(runOpInitialSync(collModOp), ErrorCodes::duplicateCodeForTest(40676)); } TEST_F(SyncTailTest, SuccessOnAssigningUUIDToCollectionWithExistingUUID) { |