diff options
author | Randolph Tan <randolph@10gen.com> | 2015-11-24 14:32:25 -0500 |
---|---|---|
committer | Randolph Tan <randolph@10gen.com> | 2015-11-25 10:15:23 -0500 |
commit | 4afeb91fb45bb343583a218e23b971cf7b3c33f1 (patch) | |
tree | 578a7278159e2a94b3d149d00aa584f16d48b10b /src/mongo/db/write_concern.h | |
parent | 3b3ef4253a6c5d5d3f18127ac2272a9696488aec (diff) | |
download | mongo-4afeb91fb45bb343583a218e23b971cf7b3c33f1.tar.gz |
SERVER-21604 v3.0 mongos fails to ping config.mongos if config servers are v3.2
Diffstat (limited to 'src/mongo/db/write_concern.h')
-rw-r--r-- | src/mongo/db/write_concern.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mongo/db/write_concern.h b/src/mongo/db/write_concern.h index 146a7ec94d0..873e6114af1 100644 --- a/src/mongo/db/write_concern.h +++ b/src/mongo/db/write_concern.h @@ -54,13 +54,16 @@ void setupSynchronousCommit(OperationContext* txn); * Verifies that the writeConcern is of type Object (BSON type) and * that the resulting writeConcern is valid for this particular host. */ -StatusWith<WriteConcernOptions> extractWriteConcern(const BSONObj& cmdObj, +StatusWith<WriteConcernOptions> extractWriteConcern(OperationContext* txn, + const BSONObj& cmdObj, const std::string& dbName); /** * Verifies that a WriteConcern is valid for this particular host. */ -Status validateWriteConcern(const WriteConcernOptions& writeConcern, const std::string& dbName); +Status validateWriteConcern(OperationContext* txn, + const WriteConcernOptions& writeConcern, + const std::string& dbName); struct WriteConcernResult { WriteConcernResult() { |