mongo 2.15.0.alpha → 2.16.0

data/spec/shared/shlib/server.sh

@@ -10,21 +10,21 @@ set_fcv() {
 
 add_uri_option() {
   opt=$1
-  
+
   if ! echo $MONGODB_URI |sed -e s,//,, |grep -q /; then
     MONGODB_URI="$MONGODB_URI/"
   fi
-  
+
   if ! echo $MONGODB_URI |grep -q '?'; then
     MONGODB_URI="$MONGODB_URI?"
   fi
-  
+
   MONGODB_URI="$MONGODB_URI&$opt"
 }
 
 prepare_server() {
   arch=$1
-  
+
   if test -n "$USE_OPT_MONGODB"; then
     export BINDIR=/opt/mongodb/bin
     export PATH=$BINDIR:$PATH
@@ -39,7 +39,7 @@ prepare_server() {
   else
     download_version="$MONGODB_VERSION"
   fi
-  
+
   url=`$(dirname $0)/get-mongodb-download-url $download_version $arch`
 
   prepare_server_from_url $url
@@ -80,7 +80,7 @@ install_mlaunch_pip() {
     # mlaunch is preinstalled in the docker image, do not install it here
     return
   fi
-  
+
   python -V || true
   python3 -V || true
   pythonpath="$MONGO_ORCHESTRATION_HOME"/python
@@ -96,20 +96,20 @@ install_mlaunch_git() {
   python3 -V || true
   which pip || true
   which pip3 || true
-  
+
   if false; then
     if ! virtualenv --version; then
       python3 `which pip3` install --user virtualenv
       export PATH=$HOME/.local/bin:$PATH
       virtualenv --version
     fi
-    
+
     venvpath="$MONGO_ORCHESTRATION_HOME"/venv
     virtualenv -p python3 $venvpath
     . $venvpath/bin/activate
-    
+
     pip3 install psutil pymongo
-    
+
     git clone $repo mlaunch
     cd mlaunch
     git checkout origin/$branch
@@ -118,13 +118,13 @@ install_mlaunch_git() {
   else
     pip install --user 'virtualenv==13'
     export PATH=$HOME/.local/bin:$PATH
-    
+
     venvpath="$MONGO_ORCHESTRATION_HOME"/venv
     virtualenv $venvpath
     . $venvpath/bin/activate
-  
+
     pip install psutil pymongo
-    
+
     git clone $repo mlaunch
     (cd mlaunch &&
       git checkout origin/$branch &&
@@ -133,24 +133,32 @@ install_mlaunch_git() {
   fi
 }
 
+# This function sets followong global variables:
+#   server_cert_path
+#   server_ca_path
+#   server_client_cert_path
+#
+# These variables are used later to connect to processes via mongo client.
 calculate_server_args() {
   local mongo_version=`echo $MONGODB_VERSION |tr -d .`
-  
+
   if test -z "$mongo_version"; then
     echo "$MONGODB_VERSION must be set and not contain only dots" 1>&2
     exit 3
   fi
-  
+
   if test $mongo_version = latest; then
     mongo_version=49
   fi
 
   local args="--setParameter enableTestCommands=1"
-  
-  if test $mongo_version -ge 47; then
+
+  if test $mongo_version -ge 50; then
+    args="$args --setParameter acceptApiVersion2=1"
+  elif test $mongo_version -ge 47; then
     args="$args --setParameter acceptAPIVersion2=1"
   fi
-  
+
   # diagnosticDataCollectionEnabled is a mongod-only parameter on server 3.2,
   # and mlaunch does not support specifying mongod-only parameters:
   # https://github.com/rueckstiess/mtools/issues/696
@@ -160,15 +168,31 @@ calculate_server_args() {
   fi
   local uri_options=
   if test "$TOPOLOGY" = replica-set; then
-    args="$args --replicaset --name ruby-driver-rs --nodes 2 --arbiter"
+    args="$args --replicaset --name test-rs --nodes 2 --arbiter"
     export HAVE_ARBITER=1
   elif test "$TOPOLOGY" = sharded-cluster; then
-    args="$args --replicaset --nodes 1 --sharded 1 --name ruby-driver-rs"
+    args="$args --replicaset --nodes 2 --sharded 1 --name test-rs"
     if test -z "$SINGLE_MONGOS"; then
       args="$args --mongos 2"
     fi
-  else
+  elif test "$TOPOLOGY" = standalone; then
     args="$args --single"
+  elif test "$TOPOLOGY" = load-balanced; then
+    args="$args --replicaset --nodes 2 --sharded 1 --name test-rs --port 27117"
+    if test -z "$MRSS_ROOT"; then
+      echo "Please set MRSS_ROOT" 1>&2
+      exit 2
+    fi
+    if test -n "$SINGLE_MONGOS"; then
+      haproxy_config=$MRSS_ROOT/share/haproxy-1.conf
+    else
+      args="$args --mongos 2"
+      haproxy_config=$MRSS_ROOT/share/haproxy-2.conf
+    fi
+    uri_options="$uri_options&loadBalanced=true"
+  else
+    echo "Unknown topology: $TOPOLOGY" 1>&2
+    exit 1
   fi
   if test -n "$MMAPV1"; then
     args="$args --storageEngine mmapv1 --smallfiles --noprealloc"
@@ -191,7 +215,6 @@ calculate_server_args() {
     fi
   fi
 
-  local server_cert_path server_ca_path server_client_cert_path
   if test "$SSL" = ssl || test -n "$OCSP_ALGORITHM"; then
     if test -n "$OCSP_ALGORITHM"; then
       if test "$OCSP_MUST_STAPLE" = 1; then
@@ -270,7 +293,7 @@ calculate_server_args() {
       ocsp_args="$ocsp_args --fault $OCSP_STATUS"
     fi
   fi
-  
+
   OCSP_ARGS="$ocsp_args"
   SERVER_ARGS="$args"
   URI_OPTIONS="$uri_options"
@@ -287,4 +310,58 @@ launch_ocsp_mock() {
 launch_server() {
   local dbdir="$1"
   python -m mtools.mlaunch.mlaunch --dir "$dbdir" --binarypath "$BINDIR" $SERVER_ARGS
+
+  if test "$TOPOLOGY" = sharded-cluster && test $MONGODB_VERSION = 3.6; then
+    # On 3.6 server the sessions collection is not immediately available,
+    # so we run the refreshLogicalSessionCacheNow command on the config server
+    # and again on each mongos in order for the mongoses
+    # to correctly report logicalSessionTimeoutMinutes.
+    mongos_regex="\s*mongos\s+([0-9]+)\s+running\s+[0-9]+"
+    config_server_regex="\s*config\sserver\s+([0-9]+)\s+running\s+[0-9]+"
+    config_server=""
+    mongoses=()
+    if test "$AUTH" = auth
+    then
+      base_url="mongodb://bob:pwd123@localhost"
+    else
+      base_url="mongodb://localhost"
+    fi
+    if test "$SSL" = "ssl"
+    then
+      mongo_command="${BINDIR}/mongo --ssl --sslPEMKeyFile $server_cert_path --sslCAFile $server_ca_path"
+    else
+      mongo_command="${BINDIR}/mongo"
+    fi
+
+    while read -r line
+    do
+        if [[ $line =~ $config_server_regex ]]
+        then
+            port="${BASH_REMATCH[1]}"
+            config_server="${base_url}:${port}"
+        fi
+        if [[ $line =~ $mongos_regex ]]
+        then
+            port="${BASH_REMATCH[1]}"
+            mongoses+=("${base_url}:${port}")
+        fi
+    done < <(python -m mtools.mlaunch.mlaunch list --dir "$dbdir" --binarypath "$BINDIR")
+
+    if [ -n "$config_server" ]; then
+      ${mongo_command} "$config_server" --eval 'db.adminCommand("refreshLogicalSessionCacheNow")'
+      for mongos in ${mongoses[*]}
+      do
+        ${mongo_command} "$mongos" --eval 'db.adminCommand("refreshLogicalSessionCacheNow")'
+      done
+    fi
+  fi
+
+  if test "$TOPOLOGY" = load-balanced; then
+    if test -z "$haproxy_config"; then
+      echo haproxy_config should have been set 1>&2
+      exit 3
+    fi
+
+    haproxy -D -f $haproxy_config -p $mongodb_dir/haproxy.pid
+  fi
 }

data/spec/shared/shlib/set_env.sh

@@ -68,9 +68,12 @@ set_env_ruby() {
     export PATH=`pwd`/ruby-head/bin:`pwd`/ruby-head/lib/ruby/gems/2.6.0/bin:$PATH
     ruby --version
     ruby --version |grep dev
+  elif test "$SYSTEM_RUBY" = 1; then
+    # Nothing
+    :
   else
     if test "$USE_OPT_TOOLCHAIN" = 1; then
-      # nothing, also PATH is already set
+      # Nothing, also PATH is already set
       :
     elif true; then
 

data/spec/solo/clean_exit_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'mongo'
 
 describe 'Clean exit' do

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 
 require 'mrss/constraints'
@@ -11,7 +14,6 @@ require 'support/primary_socket'
 require 'support/cluster_tools'
 require 'rspec/retry'
 require 'support/monitoring_ext'
-require 'support/local_resource_registry'
 
 RSpec.configure do |config|
   config.include(Authorization)
@@ -19,7 +21,7 @@ RSpec.configure do |config|
   config.extend(Constraints)
 
   config.before(:all) do
-    if ClusterConfig.instance.fcv_ish >= '3.6'
+    if ClusterConfig.instance.fcv_ish >= '3.6' && !SpecConfig.instance.serverless? # Serverless instances do not support killAllSessions command.
       kill_all_server_sessions
     end
   end

data/spec/spec_tests/auth_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 
 require 'runners/auth'
@@ -15,24 +18,38 @@ describe 'Auth' do
             require_mongo_kerberos
           end
 
-          context 'when the auth configuration is invalid', unless: test.valid? do
-            it 'raises an error' do
-              expect do
-                test.client
-              end.to raise_error(Mongo::Auth::InvalidConfiguration)
-            end
-          end
+          if test.valid?
+
+            context 'the auth configuration is valid' do
+              if test.credential
+
+                it 'creates a client with options matching the credential' do
+                  expect(test.actual_client_options).to eq(test.expected_credential)
+                end
 
-          context 'when the auth configuration is valid' do
-            context 'with empty credentials', if: test.valid? && test.credential.nil? do
-              it 'creates a client with no credential information' do
-                expect(test.client).to have_blank_credentials
+                it 'creates a user with attributes matching the credential' do
+                  expect(test.actual_user_attributes).to eq(test.expected_credential)
+                end
+              else
+
+                context 'with empty credentials' do
+                  it 'creates a client with no credential information' do
+                    expect(test.client).to have_blank_credentials
+                  end
+                end
               end
             end
 
-            it 'creates a client with the correct credentials', if: test.valid? && test.credential do
-              expect(test.received_credential).to eq(test.expected_credential)
+          else
+
+            context 'the auth configuration is invalid' do
+              it 'raises an error' do
+                expect do
+                  test.client
+                end.to raise_error(Mongo::Auth::InvalidConfiguration)
+              end
             end
+
           end
         end
       end

data/spec/spec_tests/change_streams_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 require 'runners/crud'
@@ -5,7 +8,7 @@ require 'runners/change_streams/spec'
 
 describe 'ChangeStreams' do
   require_wired_tiger
-  require_no_multi_shard
+  require_no_multi_mongos
 
   CHANGE_STREAMS_TESTS.each do |file|
 

data/spec/spec_tests/change_streams_unified_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+require 'runners/unified'
+
+base = "#{CURRENT_PATH}/spec_tests/data/change_streams_unified"
+CHANGE_STREAM_UNIFIED_TESTS = Dir.glob("#{base}/**/*.yml").sort
+
+describe 'Change stream unified spec tests' do
+  define_unified_spec_tests(base, CHANGE_STREAM_UNIFIED_TESTS)
+end

data/spec/spec_tests/client_side_encryption_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 require 'runners/crud'

data/spec/spec_tests/cmap_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 require 'runners/cmap'
@@ -37,7 +40,7 @@ describe 'Cmap' do
     context("#{spec.description} (#{file.sub(%r'.*/data/cmap/', '')})") do
 
       before do
-        subscriber = EventSubscriber.new
+        subscriber = Mrss::EventSubscriber.new
 
         monitoring = Mongo::Monitoring.new(monitoring: false)
         monitoring.subscribe(Mongo::Monitoring::CONNECTION_POOL, subscriber)
@@ -73,6 +76,9 @@ describe 'Cmap' do
         allow(socket).to receive(:alive?).and_return(true)
 
         allow_any_instance_of(Mongo::Server::Connection).to receive(:do_connect).and_return(socket)
+        if @server.load_balancer?
+          allow_any_instance_of(Mongo::Server::Connection).to receive(:service_id).and_return('very fake')
+        end
         spec.run
       end
 

data/spec/spec_tests/collection_management_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+require 'runners/unified'
+
+base = "#{CURRENT_PATH}/spec_tests/data/collection_management"
+COLLECTION_MANAGEMENT_TESTS = Dir.glob("#{base}/**/*.yml").sort
+
+describe 'Collection management spec tests' do
+  define_unified_spec_tests(base, COLLECTION_MANAGEMENT_TESTS)
+end

data/spec/spec_tests/command_monitoring_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 require 'runners/crud'
@@ -6,40 +9,42 @@ require 'runners/command_monitoring'
 describe 'Command Monitoring Events' do
 
   COMMAND_MONITORING_TESTS.each do |file|
+    context File.basename(file) do
 
-    spec = Mongo::CommandMonitoring::Spec.new(file)
+      spec = Mongo::CommandMonitoring::Spec.new(file)
 
-    spec.tests.each do |test|
-      context(test.description) do
+      spec.tests.each do |test|
+        context(test.description) do
 
-        if test.min_server_fcv
-          min_server_fcv test.min_server_fcv
-        end
-        if test.max_server_version
-          max_server_version test.max_server_version
-        end
+          if test.min_server_fcv
+            min_server_fcv test.min_server_fcv
+          end
+          if test.max_server_version
+            max_server_version test.max_server_version
+          end
 
-        let(:subscriber) do
-          EventSubscriber.new
-        end
+          let(:subscriber) do
+            Mrss::EventSubscriber.new
+          end
 
-        let(:monitoring) do
-          authorized_client.send(:monitoring)
-        end
+          let(:monitoring) do
+            authorized_client.send(:monitoring)
+          end
 
-        before do
-          authorized_collection.find.delete_many
-          authorized_client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
-        end
+          before do
+            authorized_collection.find.delete_many
+            authorized_client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+          end
 
-        test.expectations.each_with_index do |expectation, index|
+          test.expectations.each_with_index do |expectation, index|
 
-          it "generates a #{expectation.event_name} for #{expectation.command_name}" do
-            begin
-              test.run(authorized_collection, subscriber)
-              check_event(subscriber, index, expectation)
-            rescue Mongo::Error::OperationFailure, Mongo::Error::BulkWriteError
-              check_event(subscriber, index, expectation)
+            it "generates a #{expectation.event_name} for #{expectation.command_name}" do
+              begin
+                test.run(authorized_collection, subscriber)
+                check_event(subscriber, index, expectation)
+              rescue Mongo::Error::OperationFailure, Mongo::Error::BulkWriteError
+                check_event(subscriber, index, expectation)
+              end
             end
           end
         end
@@ -49,7 +54,7 @@ describe 'Command Monitoring Events' do
 
   def check_event(subscriber, index, expectation)
     subscriber.all_events.length.should > index
-    # TODO move this filtering into EventSubscriber
+    # TODO move this filtering into Mrss::EventSubscriber
     events = subscriber.all_events.reject do |event|
       (
         event.is_a?(Mongo::Monitoring::Event::CommandStarted) ||

data/spec/spec_tests/command_monitoring_unified_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+require 'runners/unified'
+
+base = "#{CURRENT_PATH}/spec_tests/data/command_monitoring_unified"
+COMMAND_MONITORING_UNIFIED_TESTS = Dir.glob("#{base}/**/*.yml").sort
+
+describe 'Command monitoring unified spec tests' do
+  define_unified_spec_tests(base, COMMAND_MONITORING_UNIFIED_TESTS)
+end

data/spec/spec_tests/connection_string_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 
 require 'runners/connection_string'

data/spec/spec_tests/crud_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 require 'runners/crud'

data/spec/spec_tests/crud_unified_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 require 'runners/unified'

data/spec/spec_tests/data/change_streams/change-streams-errors.yml

@@ -41,7 +41,7 @@ tests:
             aggregate: *collection_name
             cursor: {}
             pipeline:
-              - 
+              -
                 $changeStream: {}
               -
                 $unsupported: foo
@@ -79,9 +79,9 @@ tests:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          errorCode: 216 # An error code that's not on the old blacklist or whitelist
-          closeConnection: false
+        failCommands: ["getMore"]
+        errorCode: 216 # An error code that's not on the old deny or allow lists
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -98,4 +98,4 @@ tests:
             z: 3
     result:
       error:
-        code: 216
+        code: 216