SERVER-38957 Allow a failed changelog write in movePrimary's cleanupOnError to silently fail.

(cherry picked from commit 9cf00022b936cdb3c2234235d5aaa6be7ef6146a)

1 files changed, 6 insertions, 3 deletions

diff --git a/src/mongo/db/s/move_primary_source_manager.cpp b/src/mongo/db/s/move_primary_source_manager.cpp
index 3a2ceda9a3e..4818c85f47f 100644
--- a/src/mongo/db/s/move_primary_source_manager.cpp
+++ b/src/mongo/db/s/move_primary_source_manager.cpp
@@ -326,14 +326,17 @@ void MovePrimarySourceManager::cleanupOnError(OperationContext* opCtx) {
         return;
     }
 
-    try {
-        uassertStatusOK(Grid::get(opCtx)->catalogClient()->logChange(
+    Grid::get(opCtx)
+        ->catalogClient()
+        ->logChange(
             opCtx,
             "movePrimary.error",
             _dbname.toString(),
             _buildMoveLogEntry(_dbname.toString(), _fromShard.toString(), _toShard.toString()),
-            ShardingCatalogClient::kMajorityWriteConcern));
+            ShardingCatalogClient::kMajorityWriteConcern)
+        .ignore();
 
+    try {
         _cleanup(opCtx);
     } catch (const ExceptionForCat<ErrorCategory::NotMasterError>& ex) {
         BSONObjBuilder requestArgsBSON;