diff options
author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2022-01-21 13:48:40 -0500 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-01-28 21:44:48 +0000 |
commit | c2a2cbbffea005de6e71e0d1e8888b37e303ee35 (patch) | |
tree | f0ccc30caa4162d56bce48a445dc161d618ef7e2 | |
parent | 7e37fc56791d95db53bdf35fdd15f055f5a1fa0f (diff) | |
download | mongo-c2a2cbbffea005de6e71e0d1e8888b37e303ee35.tar.gz |
SERVER-62666 Use explicit read concern in EncryptedDBClientBase and ImplicitEncryptedDBClientBase
-rw-r--r-- | src/mongo/db/repl/read_concern_level.h | 2 | ||||
-rw-r--r-- | src/mongo/shell/encrypted_dbclient_base.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/mongo/db/repl/read_concern_level.h b/src/mongo/db/repl/read_concern_level.h index e0a8f5c3304..1cdcc21a070 100644 --- a/src/mongo/db/repl/read_concern_level.h +++ b/src/mongo/db/repl/read_concern_level.h @@ -31,6 +31,8 @@ #include <boost/optional.hpp> +#include "mongo/base/string_data.h" + namespace mongo { namespace repl { diff --git a/src/mongo/shell/encrypted_dbclient_base.cpp b/src/mongo/shell/encrypted_dbclient_base.cpp index 897d5baee2d..67011f0a888 100644 --- a/src/mongo/shell/encrypted_dbclient_base.cpp +++ b/src/mongo/shell/encrypted_dbclient_base.cpp @@ -630,7 +630,8 @@ std::shared_ptr<SymmetricKey> EncryptedDBClientBase::getDataKeyFromDisk(const UU NamespaceString fullNameNS = getCollectionNS(); FindCommandRequest findCmd{fullNameNS}; findCmd.setFilter(BSON("_id" << uuid)); - findCmd.setReadConcern(repl::ReadConcernArgs::kImplicitDefault); + findCmd.setReadConcern( + repl::ReadConcernArgs(repl::ReadConcernLevel::kMajorityReadConcern).toBSONInner()); BSONObj dataKeyObj = _conn->findOne(std::move(findCmd)); if (dataKeyObj.isEmpty()) { uasserted(ErrorCodes::BadValue, "Invalid keyID."); |