Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 17 insertions, 16 deletions

diff --git a/src/mongo/db/s/resharding/resharding_oplog_fetcher.cpp b/src/mongo/db/s/resharding/resharding_oplog_fetcher.cpp
index 064ca34c9fa..30811c8d2aa 100644
--- a/src/mongo/db/s/resharding/resharding_oplog_fetcher.cpp
+++ b/src/mongo/db/s/resharding/resharding_oplog_fetcher.cpp
@@ -41,7 +41,7 @@
 #include "mongo/client/dbclient_connection.h"
 #include "mongo/client/remote_command_targeter.h"
 #include "mongo/db/catalog_raii.h"
-#include "mongo/db/concurrency/exception_util.h"
+#include "mongo/db/concurrency/write_conflict_exception.h"
 #include "mongo/db/pipeline/aggregate_command_gen.h"
 #include "mongo/db/repl/read_concern_args.h"
 #include "mongo/db/repl/read_concern_level.h"
@@ -194,22 +194,23 @@ ExecutorFuture<void> ReshardingOplogFetcher::_reschedule(
 }
 
 bool ReshardingOplogFetcher::iterate(Client* client, CancelableOperationContextFactory factory) {
-    try {
-        std::shared_ptr<Shard> targetShard;
-        {
-            auto opCtxRaii = factory.makeOperationContext(client);
-            opCtxRaii->checkForInterrupt();
-
-            StatusWith<std::shared_ptr<Shard>> swDonor =
-                Grid::get(opCtxRaii.get())->shardRegistry()->getShard(opCtxRaii.get(), _donorShard);
-            if (!swDonor.isOK()) {
-                LOGV2_WARNING(5127203,
-                              "Error finding shard in registry, retrying.",
-                              "error"_attr = swDonor.getStatus());
-                return true;
-            }
-            targetShard = swDonor.getValue();
+    std::shared_ptr<Shard> targetShard;
+    {
+        auto opCtxRaii = factory.makeOperationContext(client);
+        opCtxRaii->checkForInterrupt();
+
+        StatusWith<std::shared_ptr<Shard>> swDonor =
+            Grid::get(opCtxRaii.get())->shardRegistry()->getShard(opCtxRaii.get(), _donorShard);
+        if (!swDonor.isOK()) {
+            LOGV2_WARNING(5127203,
+                          "Error finding shard in registry, retrying.",
+                          "error"_attr = swDonor.getStatus());
+            return true;
         }
+        targetShard = swDonor.getValue();
+    }
+
+    try {
         return consume(client, factory, targetShard.get());
     } catch (const ExceptionForCat<ErrorCategory::Interruption>&) {
         // Defer to the cancellation token for whether the Interruption exception should be retried