diff options
| author | Kyle Suarez <kyle.suarez@mongodb.com> | 2022-03-14 20:23:41 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-03-14 21:43:38 +0000 |
| commit | 1d9bde37450950dbaba7fc2eae912c4e9ba9f679 (patch) | |
| tree | ea557e79b3232f595327c75868e7d6ab8065e018 | |
| parent | 90caba6b07d4b606f6d4641a398a529926aba2ce (diff) | |
| download | mongo-1d9bde37450950dbaba7fc2eae912c4e9ba9f679.tar.gz | |
SERVER-64297 Revert temporary workaround in SERVER-64282
| -rw-r--r-- | jstests/concurrency/fsm_workloads/access_collection_in_transaction_after_catalog_changes.js | 19 | ||||
| -rw-r--r-- | src/mongo/db/exec/sbe/stages/ix_scan.cpp | 20 |
2 files changed, 12 insertions, 27 deletions
diff --git a/jstests/concurrency/fsm_workloads/access_collection_in_transaction_after_catalog_changes.js b/jstests/concurrency/fsm_workloads/access_collection_in_transaction_after_catalog_changes.js index bcb0368f072..4112b44d90e 100644 --- a/jstests/concurrency/fsm_workloads/access_collection_in_transaction_after_catalog_changes.js +++ b/jstests/concurrency/fsm_workloads/access_collection_in_transaction_after_catalog_changes.js @@ -37,17 +37,14 @@ var $config = (function() { op(ddlColl); success = true; } catch (e) { - assertWhenOwnColl.contains( - e.code, - [ - ErrorCodes.LockTimeout, - ErrorCodes.WriteConflict, - ErrorCodes.SnapshotUnavailable, - ErrorCodes.OperationNotSupportedInTransaction, - // TODO (SERVER-64297) Stop ignoring this specific error. - 4938500, - ], - () => tojson(e)); + assertWhenOwnColl.contains(e.code, + [ + ErrorCodes.LockTimeout, + ErrorCodes.WriteConflict, + ErrorCodes.SnapshotUnavailable, + ErrorCodes.OperationNotSupportedInTransaction + ], + () => tojson(e)); } // Commit or abort the transaction. diff --git a/src/mongo/db/exec/sbe/stages/ix_scan.cpp b/src/mongo/db/exec/sbe/stages/ix_scan.cpp index 71da0e96029..5fdfafd2c05 100644 --- a/src/mongo/db/exec/sbe/stages/ix_scan.cpp +++ b/src/mongo/db/exec/sbe/stages/ix_scan.cpp @@ -27,8 +27,6 @@ * it in the license file. */ -#define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kQuery - #include "mongo/platform/basic.h" #include "mongo/db/exec/sbe/stages/ix_scan.h" @@ -39,8 +37,6 @@ #include "mongo/db/exec/sbe/values/bson.h" #include "mongo/db/exec/trial_run_tracker.h" #include "mongo/db/index/index_access_method.h" -#include "mongo/logv2/log.h" -#include "mongo/util/stacktrace.h" namespace mongo::sbe { IndexScanStage::IndexScanStage(UUID collUuid, @@ -121,18 +117,10 @@ void IndexScanStage::prepare(CompileCtx& ctx) { auto indexCatalog = _coll->getIndexCatalog(); auto indexDesc = indexCatalog->findIndexByName(_opCtx, _indexName); - // TODO (SERVER-64297) Revert this uassert to a tassert. - if (!indexDesc) { - LOGV2_WARNING(6428200, - "Unable to find index; dumping stack trace", - "indexName"_attr = _indexName, - "collectionName"_attr = _collName); - printStackTrace(); - uasserted(4938500, - str::stream() << "could not find index named '" << _indexName - << "' in collection '" << _collName << "'"); - } - + tassert(4938500, + str::stream() << "could not find index named '" << _indexName << "' in collection '" + << _collName << "'", + indexDesc); _weakIndexCatalogEntry = indexCatalog->getEntryShared(indexDesc); auto entry = _weakIndexCatalogEntry.lock(); tassert(4938503, |