From 4afeb91fb45bb343583a218e23b971cf7b3c33f1 Mon Sep 17 00:00:00 2001 From: Randolph Tan Date: Tue, 24 Nov 2015 14:32:25 -0500 Subject: SERVER-21604 v3.0 mongos fails to ping config.mongos if config servers are v3.2 --- src/mongo/db/write_concern.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/mongo/db/write_concern.h') 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 extractWriteConcern(const BSONObj& cmdObj, +StatusWith 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() { -- cgit v1.2.1