CXX-692 Check writeConcern errors in findAndModify

Author: markbenvenuto

src/mongo/client/dbclient.cpp

@@ -1393,6 +1393,11 @@ void DBClientBase::_findAndModify(const StringData& ns,
     if (!ok)
         throw OperationException(result);
 
+    // Check for any write concern errors
+    WriteResult writeResult;
+    writeResult._mergeWriteConcern(result);
+    writeResult._check(true);
+
     out->appendElements(result.getObjectField("value"));
 }
 

src/mongo/client/dbclient_rs.h

@@ -203,6 +203,14 @@ class MONGO_CLIENT_API DBClientReplicaSet : public DBClientBase {
      */
     static void setAuthPooledSecondaryConn(bool setting);
 
+    virtual int getMaxWireVersion() {
+        return checkMaster()->getMaxWireVersion();
+    }
+
+    virtual int getMinWireVersion() {
+        return checkMaster()->getMinWireVersion();
+    }
+
 protected:
     /** Authorize.  Authorizes all nodes as needed
     */

src/mongo/client/dbclientinterface.h

@@ -1463,10 +1463,10 @@ class MONGO_CLIENT_API DBClientBase : public DBClientWithCommands, public DBConn
         _maxWireVersion = maxWireVersion;
     }
 
-    int getMinWireVersion() {
+    virtual int getMinWireVersion() {
         return _minWireVersion;
     }
-    int getMaxWireVersion() {
+    virtual int getMaxWireVersion() {
         return _maxWireVersion;
     }
     int getMaxBsonObjectSize() {

src/mongo/client/write_result.cpp

@@ -125,6 +125,10 @@ void WriteResult::_mergeCommandResult(const std::vector<WriteOperation*>& ops,
             _createWriteError(arrayIterator.next().Obj(), ops);
     }
 
+    _mergeWriteConcern(result);
+}
+
+void WriteResult::_mergeWriteConcern(const BSONObj& result) {
     // Handle Write Concern Errors
     if (result.hasField("writeConcernError")) {
         BSONObj writeConcernError = result.getObjectField("writeConcernError");

src/mongo/client/write_result.h

@@ -34,6 +34,7 @@ class MONGO_CLIENT_API WriteResult {
     friend class WireProtocolWriter;
     friend class CommandWriter;
     friend class BulkOperationBuilder;
+    friend class DBClientBase;
 
 public:
     /**
@@ -140,6 +141,7 @@ class MONGO_CLIENT_API WriteResult {
     const std::vector<BSONObj>& writeConcernErrors() const;
 
 private:
+    void _mergeWriteConcern(const BSONObj& result);
     void _mergeCommandResult(const std::vector<WriteOperation*>& ops, const BSONObj& result);
     void _mergeGleResult(const std::vector<WriteOperation*>& ops, const BSONObj& result);
 

src/mongo/integration/replica_set/basic.cpp

@@ -43,6 +43,18 @@ class RSBasicTest : public ReplicaSetTest {
     std::auto_ptr<DBClientReplicaSet> conn;
 };
 
+bool serverGTE(DBClientBase* c, int major, int minor) {
+    BSONObj result;
+    c->runCommand("admin", BSON("buildinfo" << true), result);
+
+    std::vector<BSONElement> version = result.getField("versionArray").Array();
+    int serverMajor = version[0].Int();
+    int serverMinor = version[1].Int();
+
+    // std::pair uses lexicographic ordering
+    return std::make_pair(serverMajor, serverMinor) >= std::make_pair(major, minor);
+}
+
 TEST_F(RSBasicTest, InsertRecoversFromPrimaryFailure) {
     WriteConcern wcAll = WriteConcern().nodes(2).timeout(60000);
     conn->insert(TEST_NS, BSON("x" << 1), 0, &wcAll);
@@ -85,4 +97,24 @@ TEST_F(RSBasicTest, SecondaryQueryIsNotInteruptedByPrimaryFailure) {
     conn->findOne(TEST_NS, Query().readPref(ReadPreference_SecondaryOnly, BSONArray()));
     primary.start();
 }
+
+TEST_F(RSBasicTest, FindAndModifyFailure) {
+    if (serverGTE(conn.get(), 3, 1)) {
+        WriteConcern wcAll = WriteConcern().nodes(5).journal(true);
+        conn->insert(TEST_NS, BSON("_id" << 1 << "i" << 1));
+
+        // findAndModify is expected to throw since we want 5 nodes, and the replica set set only
+        // has 3 nodes
+        ASSERT_THROWS(conn->findAndModify(TEST_NS,
+                                          BSON("i" << 1),
+                                          BSON("$inc" << BSON("i" << 1)),
+                                          false,
+                                          false,
+                                          BSONObj(),
+                                          BSONObj(),
+                                          &wcAll),
+                      OperationException);
+    }
+}
+
 }  // namespace