diff options
author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2015-10-02 17:53:00 -0400 |
---|---|---|
committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2015-10-07 18:33:12 -0400 |
commit | 9ba3877df2a0734fbf2148c7c16ca18bdf7d4bfb (patch) | |
tree | bf88aa2e6171dbc183922f9fd874a80098077cea /src/mongo/db/write_concern.cpp | |
parent | 8c7455b8260da4ae9ced9285e18c7df8850bf36e (diff) | |
download | mongo-9ba3877df2a0734fbf2148c7c16ca18bdf7d4bfb.tar.gz |
SERVER-19934 waitForWriteConcern should take write concern parameter
That way sub-operations, which need to wait on a specific write concern,
which might be different than the one of the entire operation don't need
to change the OperationContext.
Diffstat (limited to 'src/mongo/db/write_concern.cpp')
-rw-r--r-- | src/mongo/db/write_concern.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mongo/db/write_concern.cpp b/src/mongo/db/write_concern.cpp index 7ce188de192..f035b3f5bfd 100644 --- a/src/mongo/db/write_concern.cpp +++ b/src/mongo/db/write_concern.cpp @@ -203,9 +203,8 @@ void WriteConcernResult::appendTo(const WriteConcernOptions& writeConcern, Status waitForWriteConcern(OperationContext* txn, const OpTime& replOpTime, + const WriteConcernOptions& writeConcern, WriteConcernResult* result) { - const WriteConcernOptions& writeConcern = txn->getWriteConcern(); - // We assume all options have been validated earlier, if not, programming error dassert(validateWriteConcern(writeConcern).isOK()); |