Merge remote-tracking branch 'remotes/origin/master' into MONGOID-5336

Author: johnnyshields

.evergreen/config.yml

@@ -620,7 +620,7 @@ buildvariants:
     topology: ['replica-set', 'sharded-cluster']
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   run_on:
-    - rhel80-small
+    - ubuntu2004-small
   tasks:
      - name: "test"
 
@@ -632,7 +632,7 @@ buildvariants:
     topology: ['replica-set', 'sharded-cluster']
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   run_on:
-    - rhel70-small
+    - ubuntu1804-small
   tasks:
      - name: "test"
 
@@ -657,7 +657,7 @@ buildvariants:
     rails: ['7.0']
   display_name: "${rails}, ${driver}, ${mongodb-version}"
   run_on:
-    - rhel70-small
+    - ubuntu2004-small
   tasks:
     - name: "test"
 
@@ -695,7 +695,7 @@ buildvariants:
     rails: ['6.0', '6.1']
   display_name: "${rails}, ${driver}, ${mongodb-version}"
   run_on:
-    - rhel80-small
+    - ubuntu2004-small
   tasks:
      - name: "test"
 
@@ -708,7 +708,7 @@ buildvariants:
     rails: ['5.1', '5.2']
   display_name: "${rails}, ${driver}, ${mongodb-version}"
   run_on:
-    - rhel70-small
+    - ubuntu1804-small
   tasks:
      - name: "test"
 
@@ -721,7 +721,7 @@ buildvariants:
     i18n: '1.0'
   display_name: "i18n-1.0 ${rails}, ${driver}, ${mongodb-version}"
   run_on:
-    - rhel70-small
+    - ubuntu1804-small
   tasks:
      - name: "test"
 
@@ -735,24 +735,23 @@ buildvariants:
     test-i18n-fallbacks: yes
   display_name: "i18n fallbacks ${rails}, ${driver}, ${mongodb-version}, ${i18n}"
   run_on:
-    - rhel70-small
+    - ubuntu1804-small
   tasks:
      - name: "test"
 
-# https://jira.mongodb.org/browse/MONGOID-5216
-# - matrix_name: app-tests-ruby-3
-#   matrix_spec:
-#     ruby: ["ruby-3.0", "ruby-3.1"]
-#     driver: ["current"]
-#     mongodb-version: '5.0'
-#     topology: standalone
-#     app-tests: yes
-#     rails: ['6.0', '6.1']
-#   display_name: "app tests ${driver}, ${ruby}, ${rails}"
-#   run_on:
-#     - ubuntu2004-small
-#   tasks:
-#     - name: "test"
+- matrix_name: app-tests-ruby-3
+  matrix_spec:
+    ruby: ["ruby-3.0", "ruby-3.1"]
+    driver: ["current"]
+    mongodb-version: '5.0'
+    topology: standalone
+    app-tests: yes
+    rails: ['6.0', '6.1']
+  display_name: "app tests ${driver}, ${ruby}, ${rails}"
+  run_on:
+    - ubuntu2004-small
+  tasks:
+    - name: "test"
 
 - matrix_name: app-tests-ruby-2.7
   matrix_spec:

.evergreen/run-tests.sh

@@ -17,8 +17,16 @@ arch=`host_distro`
 
 set_fcv
 set_env_vars
+set_env_python
+set_env_node
 set_env_ruby
 
+if test -n "$APP_TESTS"; then
+  # Node from toolchain
+  export PATH=/opt/node/bin:$PATH
+  node -v
+fi
+
 prepare_server $arch
 
 install_mlaunch_virtualenv
@@ -34,13 +42,6 @@ launch_server "$dbdir"
 
 uri_options="$URI_OPTIONS"
 
-# This is needed because of ruby 3.0.0.
-# We should remove this when moving to 3.0.1
-# See https://jira.mongodb.org/browse/MONGOID-5115
-if test "$RVM_RUBY" = "ruby-3.0"; then
-  gem update --system
-fi
-
 which bundle
 bundle --version
 
@@ -104,13 +105,10 @@ if test -n "$TEST_CMD"; then
 elif test -n "$TEST_I18N_FALLBACKS"; then
   bundle exec rspec spec/integration/i18n_fallbacks_spec.rb spec/mongoid/criteria_spec.rb spec/mongoid/contextual/mongo_spec.rb
 elif test -n "$APP_TESTS"; then
-  # Need recent node for rails
-  export N_PREFIX=$HOME/.n
-  curl -o $HOME/n --retry 3 https://raw.githubusercontent.com/tj/n/master/bin/n
-  bash $HOME/n stable
-  export PATH=$HOME/.n/bin:$PATH
-  npm -g install yarn
-
+  if test -z "$DOCKER_PRELOAD"; then
+    ./spec/shared/bin/install-node
+  fi
+  
   bundle exec rspec spec/integration/app_spec.rb
 else
   bundle exec rake ci
@@ -124,6 +122,6 @@ if test -f tmp/rspec-all.json; then
   mv tmp/rspec-all.json tmp/rspec.json
 fi
 
-python2 -m mtools.mlaunch.mlaunch stop --dir "$dbdir"
+python3 -m mtools.mlaunch.mlaunch stop --dir "$dbdir"
 
 exit ${test_status}

docs/reference/configuration.txt

@@ -220,8 +220,13 @@ for details on driver options.
           # (default: 10)
           connect_timeout: 10
 
-          # The timeout to wait to execute operations on a socket before raising an error.
-          # (default: nil)
+          # How long to wait for a response for each operation sent to the
+          # server. This timeout should be set to a value larger than the
+          # processing time for the longest operation that will be executed
+          # by the application. Note that this is a client-side timeout;
+          # the server may continue executing an operation after the client
+          # aborts it with the SocketTimeout exception.
+          # (default: nil, meaning no timeout)
           socket_timeout: 5
 
           # The name of the replica set to connect to. Servers provided as seeds that do