diff options
Diffstat (limited to 'src/mongo/db/s/session_catalog_migration_source.cpp')
| -rw-r--r-- | src/mongo/db/s/session_catalog_migration_source.cpp | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/src/mongo/db/s/session_catalog_migration_source.cpp b/src/mongo/db/s/session_catalog_migration_source.cpp index c83439080e0..5706e76ba44 100644 --- a/src/mongo/db/s/session_catalog_migration_source.cpp +++ b/src/mongo/db/s/session_catalog_migration_source.cpp @@ -34,7 +34,7 @@ #include <memory> #include "mongo/db/catalog_raii.h" -#include "mongo/db/concurrency/exception_util.h" +#include "mongo/db/concurrency/write_conflict_exception.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/namespace_string.h" #include "mongo/db/op_observer.h" @@ -50,7 +50,6 @@ #include "mongo/db/transaction_history_iterator.h" #include "mongo/db/transaction_participant.h" #include "mongo/db/write_concern.h" -#include "mongo/logv2/redaction.h" #include "mongo/platform/random.h" #include "mongo/s/catalog/type_chunk.h" #include "mongo/s/shard_key_pattern.h" @@ -160,7 +159,6 @@ repl::OplogEntry makeOplogEntry(repl::OpTime opTime, {}, // namespace boost::none, // uuid boost::none, // fromMigrate - boost::none, // checkExistenceForDiffInsert repl::OplogEntry::kOplogVersion, // version oField, // o o2Field, // o2 @@ -485,23 +483,11 @@ bool SessionCatalogMigrationSource::_handleWriteHistory(WithLock lk, OperationCo // oplog entries derived from it to the oplog buffer. if (isInternalSessionForRetryableWrite(*nextOplog->getSessionId())) { - if (nextOplog->getCommandType() == repl::OplogEntry::CommandType::kApplyOps) { - // Derive retryable write oplog entries from this retryable internal transaction - // applyOps oplog entry, and add them to the oplog buffer. - _extractOplogEntriesForInternalTransactionForRetryableWrite( - lk, *nextOplog, &_unprocessedOplogBuffer); - } else { - tassert(7393800, - str::stream() << "Found an oplog entry for a retrayble internal " - "transaction with an unexpected type" - << redact(nextOplog->toBSONForLogging()), - nextOplog->getOpType() == repl::OpTypeEnum::kNoop); - if (!nextOplog->getStatementIds().empty() && - !shouldSkipOplogEntry(nextOplog.value(), _keyPattern, _chunkRange)) { - _unprocessedOplogBuffer.emplace_back(*nextOplog); - } - } - + invariant(nextOplog->getCommandType() == repl::OplogEntry::CommandType::kApplyOps); + // Derive retryable write oplog entries from this retryable internal transaction + // applyOps oplog entry, and add them to the oplog buffer. + _extractOplogEntriesForInternalTransactionForRetryableWrite( + lk, *nextOplog, &_unprocessedOplogBuffer); continue; } |