mongo 2.19.3 → 2.20.0

data/spec/mongo/session/session_pool_spec.rb

@@ -17,21 +17,6 @@ describe Mongo::Session::SessionPool do
     end
   end
 
-  describe '.create' do
-
-    let!(:pool) do
-      described_class.create(cluster)
-    end
-
-    it 'creates a session pool' do
-      expect(pool).to be_a(Mongo::Session::SessionPool)
-    end
-
-    it 'adds the pool as an instance variable on the cluster' do
-      expect(cluster.session_pool).to eq(pool)
-    end
-  end
-
   describe '#initialize' do
 
     let(:pool) do
@@ -181,7 +166,7 @@ describe Mongo::Session::SessionPool do
   describe '#end_sessions' do
 
     let(:pool) do
-      described_class.create(client.cluster)
+      client.cluster.session_pool
     end
 
     let!(:session_a) do

data/spec/mongo/session_transaction_spec.rb

@@ -26,6 +26,17 @@ describe Mongo::Session do
     collection.delete_many
   end
 
+  describe 'start_transaction' do
+    context 'when topology is sharded and server is < 4.2' do
+      max_server_fcv '4.1'
+      require_topology :sharded
+
+      it 'raises an error' do
+        expect { session.start_transaction }.to raise_error(Mongo::Error::TransactionsNotSupported, /sharded transactions require server version/)
+      end
+    end
+  end
+
   describe '#abort_transaction' do
     require_topology :replica_set
 
@@ -75,6 +86,8 @@ describe Mongo::Session do
   end
 
   describe '#with_transaction' do
+    require_topology :replica_set
+
     context 'callback successful' do
       it 'commits' do
         session.with_transaction do
@@ -123,6 +136,7 @@ describe Mongo::Session do
         expect(Mongo::Utils).to receive(:monotonic_time).ordered.and_return(start + 1)
         expect(Mongo::Utils).to receive(:monotonic_time).ordered.and_return(start + 2)
         expect(Mongo::Utils).to receive(:monotonic_time).ordered.and_return(start + 200)
+        allow(session).to receive('check_transactions_supported!').and_return true
 
         expect do
           session.with_transaction do
@@ -156,6 +170,7 @@ describe Mongo::Session do
             expect(Mongo::Utils).to receive(:monotonic_time).ordered.and_return(start + i)
           end
           expect(Mongo::Utils).to receive(:monotonic_time).ordered.and_return(start + 200)
+          allow(session).to receive('check_transactions_supported!').and_return true
 
           exc = Mongo::Error::OperationFailure.new('timeout test')
           exc.add_label(label)

data/spec/mongo/uri_spec.rb

@@ -266,15 +266,6 @@ describe Mongo::URI do
       end
     end
 
-    context 'no slash after hosts, and options' do
-
-      let(:string) { 'mongodb://example.com?tls=true' }
-
-      it 'raises an error' do
-        expect { uri }.to raise_error(Mongo::Error::InvalidURI, %r,MongoDB URI must have a slash \(/\) after the hosts if options are given,)
-      end
-    end
-
     context 'mongodb://example.com/?w' do
 
       let(:string) { 'mongodb://example.com/?w' }

data/spec/runners/crud/test.rb

@@ -110,14 +110,6 @@ module Mongo
         end
         setup_fail_point(client)
       end
-
-      def actual_collection_contents(client)
-        unless @spec.collection_name
-          raise ArgumentError, 'Spec does not specify a global collection'
-        end
-
-        client[@spec.collection_name, read_concern: {level: :majority}].find.to_a
-      end
     end
   end
 end

data/spec/runners/crud.rb

@@ -26,7 +26,7 @@ require 'runners/crud/operation'
 require 'runners/crud/verifier'
 
 def collection_data(collection)
-  collection.find.to_a
+  collection.find.sort(_id: 1).to_a
 end
 
 def crud_execute_operations(spec, test, num_ops, event_subscriber, expect_error,

data/spec/runners/transactions/test.rb

@@ -132,7 +132,6 @@ module Mongo
         @test_client ||= begin
           sdam_proc = lambda do |test_client|
             test_client.subscribe(Mongo::Monitoring::COMMAND, command_subscriber)
-
             test_client.subscribe(Mongo::Monitoring::TOPOLOGY_OPENING, sdam_subscriber)
             test_client.subscribe(Mongo::Monitoring::SERVER_OPENING, sdam_subscriber)
             test_client.subscribe(Mongo::Monitoring::SERVER_DESCRIPTION_CHANGED, sdam_subscriber)
@@ -321,6 +320,9 @@ module Mongo
         # without auto_encryption_options for querying results.
         result_collection_name = outcome&.collection_name || @spec.collection_name
         @result_collection = support_client.use(@spec.database_name)[result_collection_name]
+
+        # DRIVERS-2816, adjusted for legacy spec runner
+        @cluster_time = support_client.command(ping: 1).cluster_time
       end
 
       def teardown_test
@@ -358,12 +360,19 @@ module Mongo
         end
       end
 
+      def new_session(options)
+        test_client.start_session(options || {}).tap do |s|
+          # DRIVERS-2816, adjusted for legacy spec runner
+          s.advance_cluster_time(@cluster_time)
+        end
+      end
+
       def session0
-        @session0 ||= test_client.start_session(@session_options[:session0] || {})
+        @session0 ||= new_session(@session_options[:session0])
       end
 
       def session1
-        @session1 ||= test_client.start_session(@session_options[:session1] || {})
+        @session1 ||= new_session(@session_options[:session1])
       end
     end
   end

data/spec/runners/unified/assertions.rb

@@ -251,11 +251,11 @@ module Unified
         end
       when Hash
         if expected.keys == %w($$unsetOrMatches) && expected.values.first.keys == %w(insertedId)
-          actual_v = actual.inserted_id
+          actual_v = get_actual_value(actual, 'inserted_id')
           expected_v = expected.values.first.values.first
           assert_value_matches(actual_v, expected_v, 'inserted_id')
         elsif expected.keys == %w(insertedId)
-          actual_v = actual.inserted_id
+          actual_v = get_actual_value(actual, 'inserted_id')
           expected_v = expected.values.first
           assert_value_matches(actual_v, expected_v, 'inserted_id')
         else
@@ -270,7 +270,7 @@ module Unified
               if k.start_with?('$$')
                 assert_value_matches(actual, expected, k)
               else
-                actual_v = actual[k]
+                actual_v = get_actual_value(actual, k)
                 if Hash === expected_v && expected_v.length == 1 && expected_v.keys.first.start_with?('$$')
                   assert_value_matches(actual_v, expected_v, k)
                 else
@@ -290,6 +290,19 @@ module Unified
       end
     end
 
+    # The actual value may be of different types depending on the operation.
+    # In order to avoid having to write a lot of code to handle the different
+    # types, we use this method to get the actual value.
+    def get_actual_value(actual, key)
+      if Hash === actual
+        actual[key]
+      elsif Mongo::Operation::Result === actual && !actual.respond_to?(key.to_sym)
+        actual.documents.first[key]
+      else
+        actual.send(key)
+      end
+    end
+
     def assert_type(object, type)
       ok = [*type].reduce(false) { |acc, x| acc || type_matches?(object, x) }
 

data/spec/runners/unified/crud_operations.rb

@@ -32,6 +32,18 @@ module Unified
         if session = args.use('session')
           opts[:session] = entities.get(:session, session)
         end
+        if collation = args.use('collation')
+          opts[:collation] = collation
+        end
+        if args.key?('noCursorTimeout')
+          opts[:no_cursor_timeout] = args.use('noCursorTimeout')
+        end
+        if args.key?('oplogReplay')
+          opts[:oplog_replay] = args.use('oplogReplay')
+        end
+        if args.key?('allowPartialResults')
+          opts[:allow_partial_results] = args.use('allowPartialResults')
+        end
         req = collection.find(args.use!('filter'), **opts)
         if batch_size = args.use('batchSize')
           req = req.batch_size(batch_size)

data/spec/runners/unified/support_operations.rb

@@ -70,8 +70,7 @@ module Unified
       consume_test_runner(op)
       use_arguments(op) do |args|
         session = entities.get(:session, args.use!('session'))
-        # https://jira.mongodb.org/browse/RUBY-1813
-        true
+        session.dirty? || raise(Error::ResultMismatch, 'expected session to be dirty')
       end
     end
 
@@ -79,8 +78,7 @@ module Unified
       consume_test_runner(op)
       use_arguments(op) do |args|
         session = entities.get(:session, args.use!('session'))
-        # https://jira.mongodb.org/browse/RUBY-1813
-        true
+        session.dirty? && raise(Error::ResultMismatch, 'expected session to be not dirty')
       end
     end
 
@@ -92,7 +90,7 @@ module Unified
         unless subscriber.started_events.length >= 2
           raise Error::ResultMismatch, "Must have at least 2 events, have #{subscriber.started_events.length}"
         end
-        lsids = subscriber.started_events[-2...-1].map do |cmd|
+        lsids = subscriber.started_events[-2..-1].map do |cmd|
           cmd.command.fetch('lsid')
         end
         if expected

data/spec/runners/unified/test.rb

@@ -227,7 +227,9 @@ module Unified
             opts = {}
           end
 
-          client.start_session(**opts)
+          client.start_session(**opts).tap do |session|
+            session.advance_cluster_time(@cluster_time)
+          end
         when 'clientEncryption'
           client_encryption_opts = spec.use!('clientEncryptionOpts')
           key_vault_client = entities.get(:client, client_encryption_opts['keyVaultClient'])
@@ -342,6 +344,11 @@ module Unified
           raise NotImplementedError, "Unhandled spec keys: #{spec}"
         end
       end
+
+      # the cluster time is used to advance the cluster time of any
+      # sessions created during this test.
+      # -> see DRIVERS-2816
+      @cluster_time = root_authorized_client.command(ping: 1).cluster_time
     end
 
     def run

data/spec/shared/lib/mrss/docker_runner.rb

@@ -195,12 +195,15 @@ module Mrss
       'debian81' => 'debian:jessie',
       'debian92' => 'debian:stretch',
       'debian10' => 'debian:buster',
+      'debian11' => 'debian:bullseye',
       'ubuntu1404' => 'ubuntu:trusty',
       'ubuntu1604' => 'ubuntu:xenial',
       'ubuntu1804' => 'ubuntu:bionic',
       'ubuntu2004' => 'ubuntu:focal',
+      'ubuntu2204' => 'ubuntu:jammy',
       'rhel62' => 'centos:6',
       'rhel70' => 'centos:7',
+      'rhel80' => 'rockylinux:8',
     }.freeze
 
     def base_image

data/spec/shared/share/Dockerfile.erb

@@ -13,7 +13,7 @@ server_archive_basename = File.basename(server_url)
 server_extracted_dir = server_archive_basename.sub(/\.(tar\.gz|tgz)$/, '')
 
 # When changing, also update the hash in shlib/set_env.sh.
-TOOLCHAIN_VERSION='e8c60866f54bed7e336a37df3a97d6ae1b971b7d'
+TOOLCHAIN_VERSION='ded7ea845b08cf96f11a747d9540ba3199580dea'
 
 def ruby_toolchain_url(ruby)
   "http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-driver/#{TOOLCHAIN_VERSION}/#{distro}/#{ruby}.tar.xz"
@@ -56,7 +56,7 @@ ENV DOCKER=1
   # Ruby runtime dependencies: libyaml-0-2
   # Compiling ruby libraries: gcc make
   # Compiling python packages: python3-dev
-  # JRuby: openjdk-8-jdk-headless
+  # JRuby: openjdk-17-jdk-headless
   # Server dependencies: libsnmp30 libcurl3/libcurl4
   # Determining OS we are running on: lsb-release
   # Load balancer testing: haproxy
@@ -78,45 +78,32 @@ ENV DOCKER=1
 
   <% packages = %w(
     procps lsb-release bzip2 curl wget gpg zsh
-    git make gcc libyaml-0-2 libgmp-dev zlib1g-dev libsnappy-dev
+    git make gcc g++ libyaml-dev libgmp-dev zlib1g-dev libsnappy-dev
     krb5-user krb5-kdc krb5-admin-server libsasl2-dev libsasl2-modules-gssapi-mit
-    haproxy
+    haproxy libcurl4
     python3-pip
-    tzdata shared-mime-info software-properties-common
+    tzdata shared-mime-info software-properties-common xz-utils nodejs npm
+    openjdk-17-jdk-headless
   ) %>
 
   <% if distro =~ /ubuntu2004/ %>
     <% packages << 'libsnmp35' %>
+  <% elsif distro =~ /ubuntu2204|debian11/ %>
+    <% packages << 'libsnmp40' %>
   <% else %>
     <% packages << 'libsnmp30' %>
   <% end %>
 
-  <% if distro !~ /ubuntu2004/ %>
+  <% if distro !~ /ubuntu2004|ubuntu2204|debian11/ %>
     <% packages << 'python-pip' %>
   <% end %>
 
-  <% if distro =~ /debian10/ %>
-    <% packages << 'openjdk-11-jdk-headless' %>
-  <% elsif distro =~ /ubuntu1404/ %>
-    # Ubuntu 14.04 only has openjdk 7, this is too old to be useful
-  <% else %>
-    <% packages << 'openjdk-8-jdk-headless' %>
-  <% end %>
-
-  # ubuntu1404, ubuntu1604: libcurl3
-  # ubuntu1804, ubuntu2004, debian10: libcurl4
-  <% if distro =~ /ubuntu1804|ubuntu2004|debian10/ %>
-    <% packages << 'libcurl4' %>
-  <% else %>
-    <% packages << 'libcurl3' %>
-  <% end %>
-
-  <% if distro =~ /ubuntu1804|ubuntu2004/ %>
-    <% packages << 'nodejs' %>
+  <% if distro =~ /ubuntu2204|debian11/ %>
+    <% packages << 'python3-venv' %>
   <% end %>
 
-  <% if distro =~ /ubuntu2004/ %>
-    <% packages += %w(ruby ruby2.7 bundler) %>
+  <% if distro =~ /ubuntu2004|ubuntu2204/ %>
+    <% packages += %w(ruby bundler) %>
   <% end %>
 
   RUN apt-get update && apt-get install -y <%= packages.join(' ') %>
@@ -129,29 +116,6 @@ ENV DOCKER=1
 
 <% else %>
 
-  <% if distro =~ /rhel6/ %>
-
-    # CentOS 6 is dead - to use it retrieve the packages from vault:
-    # https://stackoverflow.com/questions/53562691/error-cannot-retrieve-repository-metadata-repomd-xml-for-repository-base-pl
-
-    <%
-
-      cfg = <<-CFG
-[base]
-name=CentOS-$releasever - Base
-#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os
-#baseurl=http://mirror.centos.org/centos/$releasever/os/$basearch/
-baseurl=http://vault.centos.org/6.10/os/x86_64/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
-CFG
-
-    %>
-
-    RUN printf "<%= cfg.gsub("\n", "\\n") %>" >/etc/yum.repos.d/CentOS-Base.repo
-
-  <% end %>
-
   # Enterprise server: net-snmp
   # lsb_release: redhat-lsb-core
   # our runner scripts: which
@@ -160,30 +124,15 @@ CFG
   # Kerberos tests: krb5-workstation + cyrus-sasl-devel to build the
   # mongo_kerberos gem + cyrus-sasl-gssapi for authentication to work
   # Local Kerberos server: krb5-server
-  # JRuby: java-1.8.0-openjdk
+  # JRuby: java-17-openjdk
   #
   # Note: lacking cyrus-sasl-gssapi produces a cryptic message
   # "SASL(-4): no mechanism available: No worthy mechs found"
   # https://github.com/farorm/python-ad/issues/10
 
-  RUN yum install -y redhat-lsb-core which git gcc libyaml krb5-server \
-    krb5-workstation cyrus-sasl-devel cyrus-sasl-gssapi java-1.8.0-openjdk \
-    net-snmp python3 cmake
-
-  <% if distro =~ /rhel6/ %>
-
-    # RHEL 6 ships with Python 2.6.
-
-    RUN yum install -y centos-release-scl && \
-      yum install -y python27-python python27-python-devel
-    ENV PATH=/opt/rh/python27/root/usr/bin:$PATH \
-      LD_LIBRARY_PATH=/opt/rh/python27/root/usr/lib64
-
-  <% else %>
-
-    RUN yum install -y python-devel
-
-  <% end %>
+  RUN yum --enablerepo=powertools install -y redhat-lsb-core which git gcc gcc-c++ libyaml-devel krb5-server \
+    krb5-workstation cyrus-sasl-devel cyrus-sasl-gssapi java-17-openjdk \
+    net-snmp python38 python38-devel cmake nodejs npm xz
 
 <% end %>
 
@@ -240,7 +189,7 @@ CFG
   <% if @env.fetch('MONGODB_VERSION') >= '4.4' %>
     # ubuntu1604 installs MarkupSafe 0.0.0 here instead of 2.0.0+
     # as specified by dependencies, causing OCSP mock to not work.
-    RUN python3 -mpip install asn1crypto oscrypto flask --upgrade
+    RUN python3 -mpip install asn1crypto oscrypto flask --upgrade --ignore-installed
   <% end %>
 
   # FLE is tested against 4.0+ servers.
@@ -300,6 +249,8 @@ WORKDIR /app
   ENV DOCKER_PRELOAD=1
 <% end %>
 
+RUN npm install --global yarn
+
 ENV MONGO_ORCHESTRATION_HOME=/tmpfs \
   PROJECT_DIRECTORY=/app \
   <%= @env.map { |k, v| %Q`#{k}="#{v.gsub('$', "\\$").gsub('"', "\\\"")}"` }.join(" \\\n  ") %>

data/spec/shared/shlib/server.sh

@@ -104,6 +104,7 @@ install_mlaunch_venv() {
     #pip install 'mtools==1.7' 'pymongo==4.1' python-dateutil psutil
 
     # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
+    pip install --upgrade setuptools
     pip install 'mtools-legacy[mlaunch]' 'pymongo<4' python-dateutil
   fi
 }

data/spec/shared/shlib/set_env.sh

@@ -1,39 +1,16 @@
 # When changing, also update the hash in share/Dockerfile.
-TOOLCHAIN_VERSION=e8c60866f54bed7e336a37df3a97d6ae1b971b7d
+TOOLCHAIN_VERSION=ded7ea845b08cf96f11a747d9540ba3199580dea
+JDK_VERSION=jdk17
 
 set_env_java() {
   ls -l /opt || true
   ls -l /usr/lib/jvm || true
 
   # Use toolchain java if it exists
-  if [ -f /opt/java/jdk8/bin/java ]; then
-    export JAVACMD=/opt/java/jdk8/bin/java
-    #export PATH=$PATH:/opt/java/jdk8/bin
-  fi
-
-  # ppc64le has it in a different place
-  if test -z "$JAVACMD" && [ -f /usr/lib/jvm/java-1.8.0/bin/java ]; then
-    export JAVACMD=/usr/lib/jvm/java-1.8.0/bin/java
-    #export PATH=$PATH:/usr/lib/jvm/java-1.8.0/bin
-  fi
-
-  if true; then
-    # newer
-    # rhel71-ppc, https://jira.mongodb.org/browse/BUILD-9231
-    if test -z "$JAVACMD" &&
-      (ls /opt/java || true) |grep -q java-1.8.0-openjdk-1.8.0 &&
-      test -f /opt/java/java-1.8.0-openjdk-1.8.0*/bin/java;
-    then
-      path=$(cd /opt/java && ls -d java-1.8.0-openjdk-1.8.0* |head -n 1)
-      export JAVACMD=/opt/java/"$path"/bin/java
-    fi
+  if [ -f /opt/java/$JDK_VERSION/bin/java ]; then
+    export JAVACMD=/opt/java/$JDK_VERSION/bin/java
   else
-    # older
-    # rhel71-ppc seems to have an /opt/java/jdk8/bin/java but it doesn't work
-    if test -n "$JAVACMD" && ! exec $JAVACMD -version; then
-      JAVACMD=
-      # we will try the /usr/lib/jvm then
-    fi
+    echo Could not find $JDK_VERSION in /opt/java
   fi
 
   if test -n "$JAVACMD"; then

data/spec/spec_tests/data/client_side_encryption/explain.yml

@@ -1,5 +1,5 @@
 runOn:
-  - minServerVersion: "4.1.10"
+  - minServerVersion: "7.0.0"
 database_name: &database_name "default"
 collection_name: &collection_name "default"
 
@@ -54,4 +54,4 @@ tests:
         # Outcome is checked using a separate MongoClient without auto encryption.
         data:
           - *doc0_encrypted
-          - *doc1_encrypted
+          - *doc1_encrypted

data/spec/spec_tests/data/connection_string/invalid-uris.yml

@@ -143,14 +143,6 @@ tests:
         hosts: ~
         auth: ~
         options: ~
-    -
-        description: "Missing delimiting slash between hosts and options"
-        uri: "mongodb://example.com?w=1"
-        valid: false
-        warning: ~
-        hosts: ~
-        auth: ~
-        options: ~
     -
         description: "Incomplete key value pair for option"
         uri: "mongodb://example.com/?w"
@@ -257,5 +249,3 @@ tests:
         hosts: ~
         auth: ~
         options: ~
-
-    

data/spec/spec_tests/data/connection_string/valid-options.yml

@@ -15,3 +15,16 @@ tests:
             db: "admin"
         options:
             authmechanism: "MONGODB-CR"
+    -
+        description: "Missing delimiting slash between hosts and options"
+        uri: "mongodb://example.com?tls=true"
+        valid: true
+        warning: false
+        hosts:
+            -
+                type: "hostname"
+                host: "example.com"
+                port: ~
+        auth: ~
+        options:
+              tls: true