CXX-275 Backport server r2.7.2..r2.7.3 changes

Author: acmorrow

src/SConscript.client

@@ -101,6 +101,9 @@ clientSourceBasic = [
     'mongo/db/jsobj.cpp',
     'mongo/db/json.cpp',
     'mongo/db/dbmessage.cpp',
+    'mongo/logger/component_message_log_domain.cpp',
+    'mongo/logger/log_component.cpp',
+    'mongo/logger/log_component_settings.cpp',
     'mongo/logger/log_manager.cpp',
     'mongo/logger/log_severity.cpp',
     'mongo/logger/logger.cpp',
@@ -121,6 +124,7 @@ clientSourceBasic = [
     'mongo/util/log.cpp',
     'mongo/util/md5.cpp',
     'mongo/util/password_digest.cpp',
+    'mongo/util/net/hostandport.cpp',
     'mongo/util/net/httpclient.cpp',
     'mongo/util/net/message.cpp',
     'mongo/util/net/message_port.cpp',
@@ -216,7 +220,10 @@ clientHeaders = [
     'mongo/db/jsobj.h',
     'mongo/db/json.h',
     'mongo/logger/appender.h',
+    'mongo/logger/component_message_log_domain.h',
     'mongo/logger/labeled_level.h',
+    'mongo/logger/log_component.h',
+    'mongo/logger/log_component_settings.h',
     'mongo/logger/log_domain.h',
     'mongo/logger/log_manager.h',
     'mongo/logger/log_severity-inl.h',

src/mongo/SConscript

@@ -55,6 +55,7 @@ unittests = [
     'platform/atomic_word_test',
     'platform/process_id_test',
     'platform/random_test',
+    'util/net/hostandport_test',
     'util/net/sock_test',
     'util/stringutils_test',
     'util/time_support_test',

src/mongo/base/error_codes.err

@@ -91,6 +91,12 @@ error_code("SplitFailed", 88)
 error_code("NetworkTimeout", 89)
 error_code("CallbackCanceled", 90)
 error_code("ShutdownInProgress", 91)
+error_code("SecondaryAheadOfPrimary", 92)
+error_code("InvalidReplicaSetConfig", 93)
+error_code("NotYetInitialized", 94)
+error_code("NotSecondary", 95)
+error_code("OperationFailed", 96)
+
 
 # Non-sequential error codes (for compatibility only)
 error_code("NotMaster", 10107) #this comes from assert_util.h
@@ -101,6 +107,8 @@ error_code("OutOfDiskSpace", 14031 )
 error_code("KeyTooLong", 17280);
 error_code("BackgroundOperationInProgressForDatabase", 12586);
 error_code("BackgroundOperationInProgressForNamespace", 12587);
+error_code("NotMasterOrSecondaryCode", 13436);
+error_code("NotMasterNoSlaveOkCode", 13435);
 
 error_class("NetworkError", ["HostUnreachable", "HostNotFound", "NetworkTimeout"])
 error_class("Interruption", ["Interrupted", "InterruptedAtShutdown", "ExceededTimeLimit"])

src/mongo/base/parse_number.cpp

@@ -131,8 +131,11 @@ namespace mongo {
             if (limits::is_signed) {
                 for (size_t i = 0; i < str.size(); ++i) {
                     NumberType digitValue = NumberType(_digitValue(str[i]));
-                    if (int(digitValue) >= base)
-                        return Status(ErrorCodes::FailedToParse, "Bad digit");
+                    if (int(digitValue) >= base) {
+                        return Status(ErrorCodes::FailedToParse,
+                                      "Bad digit \"" + str.substr(i, 1).toString() +
+                                      "\" while parsing " + stringValue.toString());
+                    }
 
 // MSVC: warning C4146: unary minus operator applied to unsigned type, result still unsigned
 // This code is statically known to be dead when NumberType is unsigned, so the warning is not real
@@ -156,8 +159,11 @@ namespace mongo {
         else {
             for (size_t i = 0; i < str.size(); ++i) {
                 NumberType digitValue = NumberType(_digitValue(str[i]));
-                if (int(digitValue) >= base)
-                    return Status(ErrorCodes::FailedToParse, "Bad digit");
+                if (int(digitValue) >= base) {
+                    return Status(ErrorCodes::FailedToParse,
+                                  "Bad digit \"" + str.substr(i, 1).toString() +
+                                  "\" while parsing " + stringValue.toString());
+                }
                 if ((NumberType(limits::max() / base) < n) ||
                     (NumberType(limits::max() - n * base) < digitValue)) {
 

src/mongo/bson/bsonelement.h

@@ -67,6 +67,9 @@ namespace mongo {
             std::string foo = obj["foo"].String(); // std::exception if not a std::string type or DNE
         */
         std::string String()        const { return chk(mongo::String).str(); }
+        const StringData checkAndGetStringData() const {
+            return chk(mongo::String).valueStringData();
+        }
         Date_t Date()               const { return chk(mongo::Date).date(); }
         double Number()             const { return chk(isNumber()).number(); }
         double Double()             const { return chk(NumberDouble)._numberDouble(); }
@@ -265,6 +268,14 @@ namespace mongo {
             return type() == mongo::String ? std::string(valuestr(), valuestrsize()-1) : std::string();
         }
 
+        /**
+         * Returns a StringData pointing into this element's data.  Does not validate that the
+         * element is actually of type String.
+         */
+        const StringData valueStringData() const {
+            return StringData(valuestr(), valuestrsize() - 1);
+        }
+
         /** Get javascript code of a CodeWScope data element. */
         const char * codeWScopeCode() const {
             massert( 16177 , "not codeWScope" , type() == CodeWScope );

src/mongo/client/connection_string_test.cpp

@@ -62,6 +62,9 @@ namespace {
 
         { "mongodb://127.0.0.1:1234,127.0.0.1:1234/dbName?foo=a&c=b&replicaSet=replName", "", "", kSet, "replName", 2, 3, "dbName" },
 
+#if 0
+        // TODO: Re-enable these tests when HostAndPort can properly parse IPv6
+
         { "mongodb://user:pwd@[::1]", "user", "pwd", kMaster, "", 1, 0, "" },
 
         { "mongodb://user@[::1]", "user", "", kMaster, "", 1, 0, "" },
@@ -109,6 +112,7 @@ namespace {
         { "mongodb://user@[::1]:1234,127.0.0.2:1234/?replicaSet=replName", "user", "", kSet, "replName", 2, 1, "" },
 
         { "mongodb://[::1]:1234,[::1]:1234/dbName?foo=a&c=b&replicaSet=replName", "", "", kSet, "replName", 2, 3, "dbName"},
+#endif
     };
 
 

src/mongo/client/connpool.cpp

@@ -25,9 +25,12 @@
 #include <boost/thread/locks.hpp>
 
 #include "mongo/client/replica_set_monitor.h"
+#include "mongo/util/log.h"
 
 namespace mongo {
 
+    MONGO_LOG_DEFAULT_COMPONENT_FILE(::mongo::logger::LogComponent::kNetworking);
+
     using std::endl;
     using std::list;
     using std::map;
@@ -264,7 +267,19 @@ namespace mongo {
         return _finishCreate( host , socketTimeout , c );
     }
 
+    void DBConnectionPool::onRelease(DBClientBase* conn) {
+        if (_hooks->empty()) {
+            return;
+        }
+
+        for (list<DBConnectionHook*>::iterator i = _hooks->begin(); i != _hooks->end(); i++) {
+            (*i)->onRelease( conn );
+        }
+    }
+
     void DBConnectionPool::release(const string& host, DBClientBase *c) {
+        onRelease(c);
+
         boost::lock_guard<boost::mutex> L(_mutex);
         _pools[PoolKey(host,c->getSoTimeout())].done(this,c);
     }

src/mongo/client/connpool.h

@@ -133,6 +133,7 @@ namespace mongo {
         virtual ~DBConnectionHook() {}
         virtual void onCreate( DBClientBase * conn ) {}
         virtual void onHandedOut( DBClientBase * conn ) {}
+        virtual void onRelease(DBClientBase* conn) {}
         virtual void onDestroy( DBClientBase * conn ) {}
     };
 
@@ -180,6 +181,7 @@ namespace mongo {
         void onCreate( DBClientBase * conn );
         void onHandedOut( DBClientBase * conn );
         void onDestroy( DBClientBase * conn );
+        void onRelease(DBClientBase* conn);
 
         void flush();
 

src/mongo/client/dbclient.cpp

@@ -38,6 +38,7 @@
 #include "mongo/db/json.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/util/assert_util.h"
+#include "mongo/util/log.h"
 #include "mongo/util/net/ssl_manager.h"
 #include "mongo/util/password_digest.h"
 
@@ -59,6 +60,8 @@ namespace mongo {
     using std::stringstream;
     using std::vector;
 
+    MONGO_LOG_DEFAULT_COMPONENT_FILE(::mongo::logger::LogComponent::kNetworking);
+
     AtomicInt64 DBClientBase::ConnectionIdSequence;
 
     const char* const saslCommandUserSourceFieldName = "userSource";
@@ -108,10 +111,10 @@ namespace mongo {
 
         string::size_type idx;
         while ( ( idx = s.find( ',' ) ) != string::npos ) {
-            _servers.push_back( s.substr( 0 , idx ) );
+            _servers.push_back(HostAndPort(s.substr(0, idx)));
             s = s.substr( idx + 1 );
         }
-        _servers.push_back( s );
+        _servers.push_back(HostAndPort(s));
 
     }
 
@@ -1995,7 +1998,7 @@ namespace mongo {
     bool serverAlive( const string &uri ) {
         DBClientConnection c( false, 0, 20 ); // potentially the connection to server could fail while we're checking if it's alive - so use timeouts
         string err;
-        if ( !c.connect( uri, err ) )
+        if ( !c.connect( HostAndPort(uri), err ) )
             return false;
         if ( !c.simpleCommand( "admin", 0, "ping" ) )
             return false;