From 6223bd89b676b0ea8241547b19e31efbcffa2c8d Mon Sep 17 00:00:00 2001 From: Matt Boros Date: Thu, 6 Jan 2022 15:15:52 +0000 Subject: SERVER-61105 Fixed log spam in moveChunk session migration (cherry picked from commit 8e681e80447e5859f79296e10911ffec39f31efa) --- .../db/s/session_catalog_migration_destination.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/mongo/db/s/session_catalog_migration_destination.cpp b/src/mongo/db/s/session_catalog_migration_destination.cpp index 9e4b42d9a66..6da715b3a41 100644 --- a/src/mongo/db/s/session_catalog_migration_destination.cpp +++ b/src/mongo/db/s/session_catalog_migration_destination.cpp @@ -449,19 +449,18 @@ void SessionCatalogMigrationDestination::_retrieveSessionStateFromSource(Service uassertStatusOK( waitForWriteConcern(opCtx, lastResult.oplogTime, kMajorityWC, &unusedWCResult)); - // We depleted the buffer at least once, transition to ready for commit. - LOGV2( - 5087101, - "Recipient finished draining oplog entries for retryable writes and " - "transactions from donor for the first time, before receiving _recvChunkCommit", - "namespace"_attr = _nss, - "migrationSessionId"_attr = _migrationSessionId, - "fromShard"_attr = _fromShard); - { stdx::lock_guard lk(_mutex); // Note: only transition to "ready to commit" if state is not error/force stop. if (_state == State::Migrating) { + // We depleted the buffer at least once, transition to ready for commit. + LOGV2(5087101, + "Recipient finished draining oplog entries for retryable writes and " + "transactions from donor for the first time, before receiving " + "_recvChunkCommit", + "namespace"_attr = _nss, + "migrationSessionId"_attr = _migrationSessionId, + "fromShard"_attr = _fromShard); _state = State::ReadyToCommit; } } -- cgit v1.2.1