Update upstream source from tag 'upstream/6.0.0'master

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

1 files changed, 0 insertions, 24 deletions

diff --git a/src/mongo/s/write_ops/batch_write_exec.cpp b/src/mongo/s/write_ops/batch_write_exec.cpp
index 980d376b607..45b89579dbb 100644
--- a/src/mongo/s/write_ops/batch_write_exec.cpp
+++ b/src/mongo/s/write_ops/batch_write_exec.cpp
@@ -104,25 +104,6 @@ bool hasTransientTransactionError(const BatchedCommandResponse& response) {
 // applies when no writes are occurring and metadata is not changing on reload.
 const int kMaxRoundsWithoutProgress(5);
 
-/**
- * Provides the write concern with which child batches have to be internally submitted.
- */
-boost::optional<WriteConcernOptions> getWriteConcernForChildBatch(OperationContext* opCtx) {
-    // Per-operation write concern is not supported in transactions.
-    if (TransactionRouter::get(opCtx)) {
-        return boost::none;
-    }
-
-    // Retrieve the WC specified by the remote client; in case of "fire and forget" request, the WC
-    // needs to be upgraded to "w: 1" for the sharding protocol to correctly handle internal
-    // writeErrors.
-    auto wc = opCtx->getWriteConcern();
-    if (!wc.requiresWriteAcknowledgement()) {
-        wc.w = 1;
-    }
-
-    return wc;
-}
 }  // namespace
 
 void BatchWriteExec::executeBatch(OperationContext* opCtx,
@@ -214,7 +195,6 @@ void BatchWriteExec::executeBatch(OperationContext* opCtx,
             //
 
             std::vector<AsyncRequestsSender::Request> requests;
-            const auto wcSettingForChildBatch = getWriteConcernForChildBatch(opCtx);
 
             // Get as many batches as we can at once
             for (auto&& childBatch : childBatches) {
@@ -237,10 +217,6 @@ void BatchWriteExec::executeBatch(OperationContext* opCtx,
                     BSONObjBuilder requestBuilder;
                     shardBatchRequest.serialize(&requestBuilder);
                     logical_session_id_helpers::serializeLsidAndTxnNumber(opCtx, &requestBuilder);
-                    if (wcSettingForChildBatch) {
-                        requestBuilder.append(WriteConcernOptions::kWriteConcernField,
-                                              wcSettingForChildBatch->toBSON());
-                    }
 
                     return requestBuilder.obj();
                 }();