CXX-370 Backport server r2.7.7..r2.7.8

Author: acmorrow

SConstruct

@@ -810,6 +810,8 @@ if has_option( "ssl" ):
         env.Append( LIBS=["crypto"] )
     if has_option("ssl-fips-capability"):
         env.Append( CPPDEFINES=["MONGO_SSL_FIPS"] )
+else:
+    env["MONGO_SSL"] = False
 
 try:
     umask = os.umask(022)
@@ -1585,6 +1587,10 @@ def doConfigure(myenv):
 
     conf.env['MONGO_SASL'] = bool(has_option("use-sasl-client"))
 
+    if conf.env['MONGO_SASL'] and not conf.env['MONGO_SSL']:
+        print("SASL support requires --ssl")
+        Exit(1)
+
     if conf.env['MONGO_SASL'] and not conf.CheckLibWithHeader(
             "sasl2", 
             ["stddef.h","sasl/sasl.h"], 

src/SConscript.client

@@ -102,21 +102,18 @@ clientSourceBasic = [
     'mongo/client/index_spec.cpp',
     'mongo/client/init.cpp',
     'mongo/client/insert_write_operation.cpp',
-    'mongo/client/native_sasl_client_session.cpp',
     'mongo/client/options.cpp',
     'mongo/client/replica_set_monitor.cpp',
     'mongo/client/sasl_client_authenticate.cpp',
     'mongo/client/sasl_client_authenticate_impl.cpp',
     'mongo/client/sasl_client_conversation.cpp',
     'mongo/client/sasl_client_session.cpp',
     'mongo/client/sasl_plain_client_conversation.cpp',
-    'mongo/client/sasl_scramsha1_client_conversation.cpp',
     'mongo/client/update_write_operation.cpp',
     'mongo/client/wire_protocol_writer.cpp',
     'mongo/client/write_concern.cpp',
     'mongo/client/write_operation_base.cpp',
     'mongo/client/write_result.cpp',
-    'mongo/crypto/mechanism_scram.cpp',
     'mongo/db/dbmessage.cpp',
     'mongo/db/json.cpp',
     'mongo/geo/coordinates2d.cpp',
@@ -159,14 +156,26 @@ clientSourceBasic = [
 
 clientSourceTz = [] if (clientEnv['MONGO_HAVE_TIMEGM'] or windows) else ['third_party/tz/timegm.c']
 
+clientSourceSSL = [
+    'mongo/client/sasl_scramsha1_client_conversation.cpp',
+    'mongo/crypto/crypto_openssl.cpp',
+    'mongo/crypto/mechanism_scram.cpp',
+]
+
 clientSourceSasl = [
     'mongo/client/cyrus_sasl_client_session.cpp',
+    'mongo/client/native_sasl_client_session.cpp',
     'mongo/client/sasl_sspi.cpp',
 ]
 
-usingSasl = libEnv['MONGO_SASL']
-
 clientSource = clientSourceBasic + clientSourceTz
+
+usingSsl = libEnv['MONGO_SSL']
+if usingSsl:
+    clientSource += clientSourceSSL
+
+
+usingSasl = libEnv['MONGO_SASL']
 if usingSasl:
     clientSource += clientSourceSasl
 

src/mongo/SConscript

@@ -58,13 +58,17 @@ unittests = [
     'platform/atomic_word_test',
     'platform/process_id_test',
     'platform/random_test',
+    'util/mongoutils/str_test',
     'util/net/hostandport_test',
     'util/net/sock_test',
     'util/string_map_test',
     'util/stringutils_test',
     'util/time_support_test',
 ]
 
+if env['MONGO_SSL']:
+   unittests += ['crypto/crypto_test']
+
 gtestEnv = staticClientEnv.Clone()
 gtestEnv.PrependUnique(
     # On windows, we need this odd flag to make the linker
@@ -93,8 +97,11 @@ integration_tests = [
     'dbclient_test',
     'dbclient_writer_test',
     'gridfs_test',
-    'sasl_test'
 ]
+
+if env['MONGO_SASL']:
+   integration_tests += ['sasl_test']
+
 integrationTestEnv = gtestEnv.Clone()
 integrationTestEnv.PrependUnique(
     LIBS=[

src/mongo/base/error_codes.err

@@ -105,6 +105,13 @@ error_code("IncompatibleAuditMetadata", 102)
 error_code("NewReplicaSetConfigurationIncompatible", 103)
 error_code("NodeNotElectable", 104)
 error_code("IncompatibleShardingMetadata", 105)
+error_code("DistributedClockSkewed", 106)
+error_code("LockFailed", 107)
+error_code("InconsistentReplicaSetNames", 108)
+error_code("ConfigurationInProgress", 109)
+error_code("CannotInitializeNodeWithData", 110)
+error_code("NotExactValueField", 111)
+error_code("DeadLock", 112)
 
 # Non-sequential error codes (for compatibility only)
 error_code("NotMaster", 10107) #this comes from assert_util.h
@@ -117,6 +124,7 @@ error_code("BackgroundOperationInProgressForDatabase", 12586);
 error_code("BackgroundOperationInProgressForNamespace", 12587);
 error_code("NotMasterOrSecondaryCode", 13436);
 error_code("NotMasterNoSlaveOkCode", 13435);
+error_code("ShardKeyTooBig", 13334);
 
 error_class("NetworkError", ["HostUnreachable", "HostNotFound", "NetworkTimeout"])
 error_class("Interruption", ["Interrupted", "InterruptedAtShutdown", "ExceededTimeLimit"])

src/mongo/bson/bson_validate_test.cpp

@@ -13,6 +13,8 @@
  *    limitations under the License.
  */
 
+#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kDefault
+
 #include <boost/scoped_array.hpp>
 
 #include "mongo/base/data_view.h"

src/mongo/bson/bsonelement.cpp

@@ -13,6 +13,8 @@
  *    limitations under the License.
  */
 
+#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kDefault
+
 #include "mongo/bson/bsonelement.h"
 
 #include "mongo/base/data_cursor.h"

src/mongo/bson/bsonobj.cpp

@@ -13,6 +13,8 @@
  *    limitations under the License.
  */
 
+#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kDefault
+
 #include "mongo/db/jsobj.h"
 
 #include "mongo/bson/bson_validate.h"

src/mongo/bson/bsonobjbuilder.cpp

@@ -13,6 +13,8 @@
  *    limitations under the License.
  */
 
+#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kDefault
+
 #include "mongo/db/jsobj.h"
 
 #include <boost/lexical_cast.hpp>

src/mongo/bson/inline_decls.h

@@ -33,39 +33,3 @@
 #define PACKED_DECL
 
 #endif
-
-namespace mongo {
-
-/* Note: do not clutter code with these -- ONLY use in hot spots / significant loops. */
-
-#if !defined(__GNUC__)
-
-// branch prediction.  indicate we expect to be true
-# define MONGO_likely(x) ((bool)(x))
-
-// branch prediction.  indicate we expect to be false
-# define MONGO_unlikely(x) ((bool)(x))
-
-# if defined(_WIN32)
-    // prefetch data from memory
-    inline void prefetch(const void *p) { 
-#if defined(_MM_HINT_T0)
-        _mm_prefetch((char *) p, _MM_HINT_T0);
-#endif
-    }
-#else
-    inline void prefetch(void *p) { }
-#endif
-
-#else
-
-# define MONGO_likely(x) ( __builtin_expect((bool)(x), 1) )
-# define MONGO_unlikely(x) ( __builtin_expect((bool)(x), 0) )
-
-    inline void prefetch(void *p) { 
-        __builtin_prefetch(p);
-    }
-
-#endif
-
-}

src/mongo/bson/util/builder.h

@@ -28,6 +28,7 @@
 
 #include "mongo/base/data_view.h"
 #include "mongo/base/string_data.h"
+#include "mongo/bson/inline_decls.h"
 #include "mongo/util/assert_util.h"
 
 namespace mongo {