summaryrefslogtreecommitdiff
path: root/src/mongo
diff options
context:
space:
mode:
authorHuayu Ouyang <huayu.ouyang@mongodb.com>2021-04-26 20:21:09 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-04-28 15:10:31 +0000
commit0b4314a71f454051694af2a1f7a3e3b60b2175ee (patch)
treef5e24a6f3c5524f4bc7e821ce2de2c604f2b6dfe /src/mongo
parent66068cc7408b1849618d619543c635dfd9db618b (diff)
downloadmongo-0b4314a71f454051694af2a1f7a3e3b60b2175ee.tar.gz
SERVER-55699 Revert tassert to uassert for internal commands without
explicit write concern
Diffstat (limited to 'src/mongo')
-rw-r--r--src/mongo/db/service_entry_point_common.cpp4
-rw-r--r--src/mongo/s/commands/strategy.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/db/service_entry_point_common.cpp b/src/mongo/db/service_entry_point_common.cpp
index a33a26e17be..31b24f5c359 100644
--- a/src/mongo/db/service_entry_point_common.cpp
+++ b/src/mongo/db/service_entry_point_common.cpp
@@ -1214,8 +1214,8 @@ void RunCommandAndWaitForWriteConcern::_setup() {
// WriteConcern should always be explicitly specified by operations received
// from internal clients (ie. from a mongos or mongod), even if it is empty
// (ie. writeConcern: {}, which is equivalent to { w: 1, wtimeout: 0 }).
- tassert(
- 5569900,
+ uassert(
+ 4569201,
"received command without explicit writeConcern on an internalClient connection {}"_format(
redact(request.body.toString())),
request.body.hasField(WriteConcernOptions::kWriteConcernField));
diff --git a/src/mongo/s/commands/strategy.cpp b/src/mongo/s/commands/strategy.cpp
index c01ba3c220c..4429987d9f3 100644
--- a/src/mongo/s/commands/strategy.cpp
+++ b/src/mongo/s/commands/strategy.cpp
@@ -654,8 +654,8 @@ Status ParseAndRunCommand::RunInvocation::_setup() {
(!TransactionRouter::get(opCtx) || isTransactionCommand(_parc->_commandName)) &&
!opCtx->getClient()->isInDirectClient()) {
if (isInternalClient) {
- tassert(
- 5569901,
+ uassert(
+ 5569900,
"received command without explicit writeConcern on an internalClient connection {}"_format(
redact(request.body.toString())),
request.body.hasField(WriteConcernOptions::kWriteConcernField));