mongo 2.17.1 → 2.18.1

data/spec/spec_tests/unified_spec.rb

@@ -6,13 +6,18 @@ require 'spec_helper'
 require 'runners/unified'
 
 base = "#{CURRENT_PATH}/spec_tests/data/unified"
+INVALID_UNIFIED_TESTS = Dir.glob("#{base}/invalid/**/*.yml").sort
 PASS_UNIFIED_TESTS = Dir.glob("#{base}/valid-pass/**/*.yml").sort
 FAIL_UNIFIED_TESTS = Dir.glob("#{base}/valid-fail/**/*.yml").sort
 
-describe 'Unified spec tests' do
+describe 'Unified spec tests - valid pass' do
   define_unified_spec_tests(base, PASS_UNIFIED_TESTS)
 end
 
+describe 'Unified spec tests - invalid' do
+  define_unified_spec_tests(base, INVALID_UNIFIED_TESTS)
+end
+
 describe 'Unified spec tests - expected failures' do
   define_unified_spec_tests(base, FAIL_UNIFIED_TESTS, expect_failure: true)
 end

data/spec/stress/connection_pool_timing_spec.rb

@@ -25,7 +25,7 @@ describe 'Connection pool timing test' do
   end
 
   let(:client) do
-    authorized_client.with(options.merge(monitoring: true))
+    authorized_client.with(options.merge(monitoring_io: true))
   end
 
   let!(:collection) do
@@ -169,7 +169,8 @@ describe 'Connection pool timing test' do
     # On JRuby, sometimes the following error is produced indicating
     # possible data corruption or an interpreter bug:
     # RSpec::Expectations::ExpectationNotMetError: expected no Exception, got #<Mongo::Error::OperationFailure: Invalid ns [ruby-driver.] (73) (on localhost:27018, modern retry, attempt 1) (on localhost:27018, modern retry, attempt 1)>
-    it 'does not error', retry: (BSON::Environment.jruby? ? 3 : 1) do
+    retry_test tries: (BSON::Environment.jruby? ? 3 : 1)
+    it 'does not error' do
       threads
       start = Time.now
       expect do

data/spec/stress/fork_reconnect_stress_spec.rb

@@ -51,7 +51,8 @@ describe 'fork reconnect' do
       end
     end
 
-    context 'when parent is operating on client during the fork', retry: 3 do
+    retry_test
+    context 'when parent is operating on client during the fork' do
       # This test intermittently fails in evergreen with pool size of 5,
       # with a number of pending connections in the pool.
       # The reason could be that handshaking is slow or operations are slow
@@ -59,7 +60,7 @@ describe 'fork reconnect' do
       # Sometimes it seems the monitoring connection experiences network
       # errors (despite being a loopback connection) which causes the test
       # to fail as then server selection fails.
-      # The retry: 3 is to deal with network errors on monitoring connection.
+      # The retry_test is to deal with network errors on monitoring connection.
 
       let(:client) { authorized_client.with(max_pool_size: 10,
         wait_queue_timeout: 10, socket_timeout: 2, connect_timeout: 2) }

data/spec/support/authorization.rb

@@ -23,7 +23,7 @@ TEST_COLL = 'test'.freeze
 # An invalid write concern.
 #
 # @since 2.4.2
-INVALID_WRITE_CONCERN = { w: 4 }
+INVALID_WRITE_CONCERN = { w: 4000 }
 
 module Authorization
 

data/spec/support/background_thread_registry.rb

@@ -30,7 +30,8 @@ class BackgroundThreadRegistry
       @records << OpenStruct.new(
         thread: thread,
         object: object,
-        example: $current_example,
+        # When rake spec:prepare is run, the current_example method is not defined
+        example: RSpec.respond_to?(:current_example) ? RSpec.current_example : nil,
       )
     end
   end
@@ -46,7 +47,7 @@ class BackgroundThreadRegistry
             msg << "\n  with options: #{record.object.options}"
           end
           if record.example
-            msg << "\n  in #{record.example.id} #{record.example.full_description}"
+            msg << "\n  in #{record.example.id}: #{record.example.full_description}"
           else
             msg << "\n  not in an example"
           end
@@ -57,14 +58,3 @@ class BackgroundThreadRegistry
     end
   end
 end
-
-RSpec.configure do |config|
-  config.around do |example|
-    $current_example = example
-    begin
-      example.run
-    ensure
-      $current_example = nil
-    end
-  end
-end

data/spec/support/certificates/atlas-ocsp-ca.crt

@@ -2,16 +2,16 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            0a:35:08:d5:5c:29:2b:01:7d:f8:ad:65:c0:0f:f7:e4
+            06:d8:d9:04:d5:58:43:46:f6:8a:2f:a7:54:22:7e:c4
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: C = US, O = DigiCert Inc, OU = www.digicert.com, CN = DigiCert Global Root CA
         Validity
-            Not Before: Sep 24 00:00:00 2020 GMT
-            Not After : Sep 23 23:59:59 2030 GMT
+            Not Before: Apr 14 00:00:00 2021 GMT
+            Not After : Apr 13 23:59:59 2031 GMT
         Subject: C = US, O = DigiCert Inc, CN = DigiCert TLS RSA SHA256 2020 CA1
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (2048 bit)
+                Public-Key: (2048 bit)
                 Modulus:
                     00:c1:4b:b3:65:47:70:bc:dd:4f:58:db:ec:9c:ed:
                     c3:66:e5:1f:31:13:54:ad:4a:66:46:1f:2c:0a:ec:
@@ -33,57 +33,51 @@ Certificate:
                     99:f5
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE, pathlen:0
             X509v3 Subject Key Identifier: 
                 B7:6B:A2:EA:A8:AA:84:8C:79:EA:B4:DA:0F:98:B2:C5:95:76:B9:F4
             X509v3 Authority Key Identifier: 
-                keyid:03:DE:50:35:56:D1:4C:BB:66:F0:A3:E2:1B:1B:C3:97:B2:3D:D1:55
-
+                03:DE:50:35:56:D1:4C:BB:66:F0:A3:E2:1B:1B:C3:97:B2:3D:D1:55
             X509v3 Key Usage: critical
                 Digital Signature, Certificate Sign, CRL Sign
             X509v3 Extended Key Usage: 
                 TLS Web Server Authentication, TLS Web Client Authentication
-            X509v3 Basic Constraints: critical
-                CA:TRUE, pathlen:0
             Authority Information Access: 
                 OCSP - URI:http://ocsp.digicert.com
                 CA Issuers - URI:http://cacerts.digicert.com/DigiCertGlobalRootCA.crt
-
             X509v3 CRL Distribution Points: 
-
                 Full Name:
                   URI:http://crl3.digicert.com/DigiCertGlobalRootCA.crl
-
-                Full Name:
-                  URI:http://crl4.digicert.com/DigiCertGlobalRootCA.crl
-
             X509v3 Certificate Policies: 
+                Policy: 2.16.840.1.114412.2.1
                 Policy: 2.23.140.1.1
                 Policy: 2.23.140.1.2.1
                 Policy: 2.23.140.1.2.2
                 Policy: 2.23.140.1.2.3
-
     Signature Algorithm: sha256WithRSAEncryption
-         77:ab:b7:7a:27:3d:ae:bb:f6:7f:e0:5a:56:c9:84:aa:ca:5b:
-         71:17:dd:22:47:fc:4e:9f:ee:d0:c1:a4:04:e1:a3:eb:c5:49:
-         c1:fd:d1:c9:df:8c:af:94:45:2c:46:2a:a3:63:39:20:f9:9e:
-         4a:24:94:41:c8:a9:d9:e2:9c:54:05:06:cb:5c:1c:be:00:1b:
-         0f:a8:5a:ff:19:bb:65:c7:16:af:21:56:dd:61:05:c9:e9:8f:
-         98:76:df:6b:1b:d0:72:0c:50:b9:30:29:7a:bf:60:59:10:66:
-         13:3a:2d:ac:15:11:6c:2d:23:0c:02:3e:05:3b:fe:e5:a1:9c:
-         e2:8a:db:87:d7:4a:e8:5e:e7:48:06:eb:ab:12:9a:f2:af:84:
-         c3:5b:83:4a:99:81:83:ab:00:a1:ca:0a:3c:4c:a2:25:89:2a:
-         22:a7:a4:f3:33:4c:5b:8c:2e:1a:02:97:0f:9d:8f:6d:2d:95:
-         08:fb:4f:da:f1:91:38:25:e1:9c:6e:61:18:87:6a:ce:b1:bb:
-         00:30:6a:9b:b7:af:da:f1:c5:97:fe:8a:78:24:aa:ea:93:80:
-         ba:33:65:7a:bc:a1:77:e9:7f:69:14:0b:00:3f:77:92:b1:4d:
-         5b:73:87:0a:13:d0:9c:c8:f2:4b:39:4f:52:84:49:a6:4c:90:
-         4e:1f:f7:b4
+    Signature Value:
+        80:32:ce:5e:0b:dd:6e:5a:0d:0a:af:e1:d6:84:cb:c0:8e:fa:
+        85:70:ed:da:5d:b3:0c:f7:2b:75:40:fe:85:0a:fa:f3:31:78:
+        b7:70:4b:1a:89:58:ba:80:bd:f3:6b:1d:e9:7e:cf:0b:ba:58:
+        9c:59:d4:90:d3:fd:6c:fd:d0:98:6d:b7:71:82:5b:cf:6d:0b:
+        5a:09:d0:7b:de:c4:43:d8:2a:a4:de:9e:41:26:5f:bb:8f:99:
+        cb:dd:ae:e1:a8:6f:9f:87:fe:74:b7:1f:1b:20:ab:b1:4f:c6:
+        f5:67:5d:5d:9b:3c:e9:ff:69:f7:61:6c:d6:d9:f3:fd:36:c6:
+        ab:03:88:76:d2:4b:2e:75:86:e3:fc:d8:55:7d:26:c2:11:77:
+        df:3e:02:b6:7c:f3:ab:7b:7a:86:36:6f:b8:f7:d8:93:71:cf:
+        86:df:73:30:fa:7b:ab:ed:2a:59:c8:42:84:3b:11:17:1a:52:
+        f3:c9:0e:14:7d:a2:5b:72:67:ba:71:ed:57:47:66:c5:b8:02:
+        4a:65:34:5e:8b:d0:2a:3c:20:9c:51:99:4c:e7:52:9e:f7:6b:
+        11:2b:0d:92:7e:1d:e8:8a:eb:36:16:43:87:ea:2a:63:bf:75:
+        3f:eb:de:c4:03:bb:0a:3c:f7:30:ef:eb:af:4c:fc:8b:36:10:
+        73:3e:f3:a4
 
 -----BEGIN CERTIFICATE-----
-MIIE6jCCA9KgAwIBAgIQCjUI1VwpKwF9+K1lwA/35DANBgkqhkiG9w0BAQsFADBh
+MIIEvjCCA6agAwIBAgIQBtjZBNVYQ0b2ii+nVCJ+xDANBgkqhkiG9w0BAQsFADBh
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
 d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
-QTAeFw0yMDA5MjQwMDAwMDBaFw0zMDA5MjMyMzU5NTlaME8xCzAJBgNVBAYTAlVT
+QTAeFw0yMTA0MTQwMDAwMDBaFw0zMTA0MTMyMzU5NTlaME8xCzAJBgNVBAYTAlVT
 MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKTAnBgNVBAMTIERpZ2lDZXJ0IFRMUyBS
 U0EgU0hBMjU2IDIwMjAgQ0ExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
 AQEAwUuzZUdwvN1PWNvsnO3DZuUfMRNUrUpmRh8sCuxkB+Uu3Ny5CiDt3+PE0J6a
@@ -91,20 +85,19 @@ qXodgojlEVbbHp9YwlHnLDQNLtKS4VbL8Xlfs7uHyiUDe5pSQWYQYE9XE0nw6Ddn
 g9/n00tnTCJRpt8OmRDtV1F0JuJ9x8piLhMbfyOIJVNvwTRYAIuE//i+p1hJInuW
 raKImxW8oHzf6VGo1bDtN+I2tIJLYrVJmuzHZ9bjPvXj1hJeRPG/cUJ9WIQDgLGB
 Afr5yjK7tI4nhyfFK3TUqNaX3sNk+crOU6JWvHgXjkkDKa77SU+kFbnO8lwZV21r
-eacroicgE7XQPUDTITAHk+qZ9QIDAQABo4IBrjCCAaowHQYDVR0OBBYEFLdrouqo
-qoSMeeq02g+YssWVdrn0MB8GA1UdIwQYMBaAFAPeUDVW0Uy7ZvCj4hsbw5eyPdFV
-MA4GA1UdDwEB/wQEAwIBhjAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-EgYDVR0TAQH/BAgwBgEB/wIBADB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGG
+eacroicgE7XQPUDTITAHk+qZ9QIDAQABo4IBgjCCAX4wEgYDVR0TAQH/BAgwBgEB
+/wIBADAdBgNVHQ4EFgQUt2ui6qiqhIx56rTaD5iyxZV2ufQwHwYDVR0jBBgwFoAU
+A95QNVbRTLtm8KPiGxvDl7I90VUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGG
 GGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBABggrBgEFBQcwAoY0aHR0cDovL2Nh
-Y2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNydDB7BgNV
-HR8EdDByMDegNaAzhjFodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRH
-bG9iYWxSb290Q0EuY3JsMDegNaAzhjFodHRwOi8vY3JsNC5kaWdpY2VydC5jb20v
-RGlnaUNlcnRHbG9iYWxSb290Q0EuY3JsMDAGA1UdIAQpMCcwBwYFZ4EMAQEwCAYG
-Z4EMAQIBMAgGBmeBDAECAjAIBgZngQwBAgMwDQYJKoZIhvcNAQELBQADggEBAHer
-t3onPa679n/gWlbJhKrKW3EX3SJH/E6f7tDBpATho+vFScH90cnfjK+URSxGKqNj
-OSD5nkoklEHIqdninFQFBstcHL4AGw+oWv8Zu2XHFq8hVt1hBcnpj5h232sb0HIM
-ULkwKXq/YFkQZhM6LawVEWwtIwwCPgU7/uWhnOKK24fXSuhe50gG66sSmvKvhMNb
-g0qZgYOrAKHKCjxMoiWJKiKnpPMzTFuMLhoClw+dj20tlQj7T9rxkTgl4ZxuYRiH
-as6xuwAwapu3r9rxxZf+ingkquqTgLozZXq8oXfpf2kUCwA/d5KxTVtzhwoT0JzI
-8ks5T1KESaZMkE4f97Q=
+Y2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNydDBCBgNV
+HR8EOzA5MDegNaAzhjFodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRH
+bG9iYWxSb290Q0EuY3JsMD0GA1UdIAQ2MDQwCwYJYIZIAYb9bAIBMAcGBWeBDAEB
+MAgGBmeBDAECATAIBgZngQwBAgIwCAYGZ4EMAQIDMA0GCSqGSIb3DQEBCwUAA4IB
+AQCAMs5eC91uWg0Kr+HWhMvAjvqFcO3aXbMM9yt1QP6FCvrzMXi3cEsaiVi6gL3z
+ax3pfs8LulicWdSQ0/1s/dCYbbdxglvPbQtaCdB73sRD2Cqk3p5BJl+7j5nL3a7h
+qG+fh/50tx8bIKuxT8b1Z11dmzzp/2n3YWzW2fP9NsarA4h20ksudYbj/NhVfSbC
+EXffPgK2fPOre3qGNm+499iTcc+G33Mw+nur7SpZyEKEOxEXGlLzyQ4UfaJbcme6
+ce1XR2bFuAJKZTRei9AqPCCcUZlM51Ke92sRKw2Sfh3oius2FkOH6ipjv3U/697E
+A7sKPPcw7+uvTPyLNhBzPvOk
 -----END CERTIFICATE-----

data/spec/support/certificates/atlas-ocsp.crt

@@ -2,42 +2,41 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            08:dc:93:55:36:6d:c5:92:20:d0:a3:4c:a1:19:ab:2d
+            0e:fb:8b:f4:73:3e:98:df:1d:48:6d:da:d2:08:ca:0d
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: C = US, O = DigiCert Inc, CN = DigiCert TLS RSA SHA256 2020 CA1
         Validity
-            Not Before: Apr 27 00:00:00 2021 GMT
-            Not After : May 25 23:59:59 2022 GMT
+            Not Before: May  5 00:00:00 2022 GMT
+            Not After : Jun  2 23:59:59 2023 GMT
         Subject: C = US, ST = New York, L = New York, O = "MongoDB, Inc.", CN = *.mongodb-dev.net
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (2048 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:bb:c1:de:f6:08:39:fb:f1:9a:f7:d4:68:6a:d7:
-                    81:57:0c:09:b9:8f:39:e5:c8:b1:53:52:d8:64:0c:
-                    e1:92:9c:ca:3f:92:46:86:5c:e2:8f:20:cf:f9:99:
-                    d0:95:46:51:7e:55:f7:3d:62:1b:a4:e7:79:31:0c:
-                    39:9d:23:bc:00:6f:2f:3d:5f:d4:88:1b:d0:9c:42:
-                    26:45:1b:11:b2:d7:45:f5:aa:2f:07:43:da:bc:ab:
-                    43:cb:0b:12:59:41:24:c3:bb:86:7f:2d:1a:c9:26:
-                    d7:6b:25:57:48:9c:88:1a:20:fb:65:01:71:27:0c:
-                    24:a7:23:40:dc:b6:69:4d:55:ef:14:ba:bd:05:b6:
-                    cf:5e:b0:c2:f6:56:bc:88:e9:81:04:94:80:9b:cf:
-                    ee:f3:15:05:79:61:41:21:4a:a1:23:29:66:90:e9:
-                    d7:03:1e:4f:30:bd:81:46:e4:9b:ab:1f:f8:02:5c:
-                    58:98:48:c5:50:16:16:80:0d:25:be:53:27:aa:8b:
-                    ca:6c:d5:d9:89:50:2b:38:a6:55:fe:c3:0a:6a:db:
-                    9c:1e:23:a2:84:93:4f:d1:a1:3d:00:48:ab:c1:2a:
-                    3c:0a:59:a8:5b:d4:88:32:54:a9:de:88:de:1a:82:
-                    ef:61:fa:90:fa:42:3d:1d:a8:98:d6:3b:a5:d4:eb:
-                    c6:cf
+                    00:b3:40:eb:4a:26:af:07:a3:ea:58:c7:3b:50:5c:
+                    94:47:5a:0a:9d:86:b7:bb:03:9c:5a:4a:23:5e:7c:
+                    b1:cd:fc:4f:56:d5:05:4e:ce:f8:f2:b1:55:09:13:
+                    ff:cc:e6:a4:fb:41:2e:0c:8f:1a:a3:ea:4b:a3:51:
+                    c6:f7:91:e6:47:49:ae:3b:94:df:68:80:68:2a:62:
+                    a2:d1:42:5b:89:c1:70:2b:1c:a7:84:df:98:86:1a:
+                    69:eb:88:c4:51:4d:c9:7f:10:90:a0:0a:c5:7c:07:
+                    12:9e:c2:94:e1:88:2e:2d:21:94:a4:8a:27:1f:20:
+                    1b:6f:14:27:21:0c:4b:6f:72:5b:18:e7:75:7a:90:
+                    4c:a8:18:e7:4d:0f:ed:e4:03:f4:10:b7:65:23:9f:
+                    b2:5f:0d:eb:85:3c:b0:34:d3:9a:2c:80:85:2e:53:
+                    35:19:44:03:13:b3:df:fb:0d:db:80:6f:12:60:1a:
+                    b8:d6:25:0d:6d:23:fd:a6:d8:aa:dc:82:73:cc:d2:
+                    26:9b:71:50:9a:09:cf:ef:60:ba:d1:22:cb:fb:2f:
+                    69:a2:a6:c6:a9:30:77:1c:d7:bc:c2:6e:6d:e6:69:
+                    65:f3:91:3d:ee:04:f9:a0:41:5f:50:dc:75:15:4d:
+                    15:43:76:35:e9:97:65:7a:d8:3f:00:4d:44:29:7c:
+                    5d:25
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Authority Key Identifier: 
-                keyid:B7:6B:A2:EA:A8:AA:84:8C:79:EA:B4:DA:0F:98:B2:C5:95:76:B9:F4
-
+                B7:6B:A2:EA:A8:AA:84:8C:79:EA:B4:DA:0F:98:B2:C5:95:76:B9:F4
             X509v3 Subject Key Identifier: 
-                3D:23:31:1E:EA:1C:8D:8A:09:AA:2D:2A:84:BF:06:31:DE:87:04:01
+                22:7C:2F:C7:F4:D6:75:0E:A1:02:32:21:1A:A6:29:25:46:48:B8:6A
             X509v3 Subject Alternative Name: 
                 DNS:*.mongodb-dev.net, DNS:mongodb-dev.net
             X509v3 Key Usage: critical
@@ -45,113 +44,109 @@ Certificate:
             X509v3 Extended Key Usage: 
                 TLS Web Server Authentication, TLS Web Client Authentication
             X509v3 CRL Distribution Points: 
-
                 Full Name:
-                  URI:http://crl3.digicert.com/DigiCertTLSRSASHA2562020CA1.crl
-
+                  URI:http://crl3.digicert.com/DigiCertTLSRSASHA2562020CA1-4.crl
                 Full Name:
-                  URI:http://crl4.digicert.com/DigiCertTLSRSASHA2562020CA1.crl
-
+                  URI:http://crl4.digicert.com/DigiCertTLSRSASHA2562020CA1-4.crl
             X509v3 Certificate Policies: 
                 Policy: 2.23.140.1.2.2
                   CPS: http://www.digicert.com/CPS
-
             Authority Information Access: 
                 OCSP - URI:http://ocsp.digicert.com
-                CA Issuers - URI:http://cacerts.digicert.com/DigiCertTLSRSASHA2562020CA1.crt
-
-            X509v3 Basic Constraints: critical
+                CA Issuers - URI:http://cacerts.digicert.com/DigiCertTLSRSASHA2562020CA1-1.crt
+            X509v3 Basic Constraints: 
                 CA:FALSE
             CT Precertificate SCTs: 
                 Signed Certificate Timestamp:
                     Version   : v1 (0x0)
-                    Log ID    : 29:79:BE:F0:9E:39:39:21:F0:56:73:9F:63:A5:77:E5:
-                                BE:57:7D:9C:60:0A:F8:F9:4D:5D:26:5C:25:5D:C7:84
-                    Timestamp : Apr 27 23:28:05.994 2021 GMT
+                    Log ID    : E8:3E:D0:DA:3E:F5:06:35:32:E7:57:28:BC:89:6B:C9:
+                                03:D3:CB:D1:11:6B:EC:EB:69:E1:77:7D:6D:06:BD:6E
+                    Timestamp : May  5 16:12:54.726 2022 GMT
                     Extensions: none
                     Signature : ecdsa-with-SHA256
-                                30:45:02:20:42:20:09:2C:F8:4F:9C:4D:70:0C:1D:A6:
-                                39:A1:EC:20:4B:54:4B:50:5E:B5:B9:71:1F:6B:60:BC:
-                                65:5B:E7:0F:02:21:00:BA:DE:65:82:26:65:7C:D7:01:
-                                7C:36:51:71:CF:F7:2C:09:7B:C7:9A:1F:E4:6D:8E:11:
-                                7E:DB:60:52:BC:82:8B
+                                30:45:02:21:00:C4:D8:1A:00:3C:BD:E5:E1:13:B2:5D:
+                                DA:7F:69:A9:4C:83:AB:CC:C2:00:9F:FB:98:09:44:5F:
+                                93:0C:92:CD:F7:02:20:2D:E2:D6:A4:3B:61:06:25:1E:
+                                22:2F:5E:2A:D4:76:0D:FE:12:E9:91:65:26:69:25:6C:
+                                53:E4:C3:2F:4B:89:AF
                 Signed Certificate Timestamp:
                     Version   : v1 (0x0)
-                    Log ID    : 22:45:45:07:59:55:24:56:96:3F:A1:2F:F1:F7:6D:86:
-                                E0:23:26:63:AD:C0:4B:7F:5D:C6:83:5C:6E:E2:0F:02
-                    Timestamp : Apr 27 23:28:05.942 2021 GMT
+                    Log ID    : 35:CF:19:1B:BF:B1:6C:57:BF:0F:AD:4C:6D:42:CB:BB:
+                                B6:27:20:26:51:EA:3F:E1:2A:EF:A8:03:C3:3B:D6:4C
+                    Timestamp : May  5 16:12:54.786 2022 GMT
                     Extensions: none
                     Signature : ecdsa-with-SHA256
-                                30:44:02:20:0C:6B:5C:7F:31:B5:24:10:73:23:AF:27:
-                                20:11:58:9E:40:A6:6A:BB:D8:48:0F:D1:4A:F1:F8:A9:
-                                B0:30:1E:34:02:20:13:04:B5:82:28:59:D7:0B:86:7F:
-                                C6:22:6E:9C:67:FF:F1:A3:9F:BF:54:AB:0D:B8:1A:8E:
-                                16:D2:F1:8E:37:FF
+                                30:45:02:20:46:F0:9E:AE:32:A7:A7:CA:22:C6:64:EE:
+                                7F:9F:C6:EA:3C:BE:3B:2F:E2:09:C0:ED:A9:E1:EE:16:
+                                F9:F1:6C:1E:02:21:00:BD:1A:42:73:A5:CE:E6:8A:CE:
+                                BC:4C:3E:42:D4:0B:FC:89:3B:D5:1E:29:E8:38:F7:44:
+                                5B:22:9A:FA:1D:B3:57
                 Signed Certificate Timestamp:
                     Version   : v1 (0x0)
-                    Log ID    : 51:A3:B0:F5:FD:01:79:9C:56:6D:B8:37:78:8F:0C:A4:
-                                7A:CC:1B:27:CB:F7:9E:88:42:9A:0D:FE:D4:8B:05:E5
-                    Timestamp : Apr 27 23:28:06.392 2021 GMT
+                    Log ID    : B7:3E:FB:24:DF:9C:4D:BA:75:F2:39:C5:BA:58:F4:6C:
+                                5D:FC:42:CF:7A:9F:35:C4:9E:1D:09:81:25:ED:B4:99
+                    Timestamp : May  5 16:12:54.779 2022 GMT
                     Extensions: none
                     Signature : ecdsa-with-SHA256
-                                30:46:02:21:00:D0:FE:FE:CA:E2:72:85:3A:A6:13:D0:
-                                ED:55:8B:67:AF:86:F4:D7:BE:66:67:BB:99:BF:7C:10:
-                                2D:28:0E:49:C3:02:21:00:BF:FF:BA:B8:4D:D1:B7:6A:
-                                6B:E9:B3:E5:A6:93:CA:14:37:70:C1:4F:89:89:66:58:
-                                3F:AA:22:B0:1E:F9:14:DF
+                                30:45:02:20:2F:72:9B:CC:88:04:F1:3B:8B:BC:01:85:
+                                B2:16:B4:AF:4A:CB:45:E8:0B:29:D1:77:6C:2C:56:0C:
+                                8D:1C:61:7C:02:21:00:A4:67:AC:08:40:83:82:9E:22:
+                                75:3A:92:91:1E:12:23:01:B9:04:3B:A3:60:5F:E8:D1:
+                                59:4E:88:DB:C5:DE:DD
     Signature Algorithm: sha256WithRSAEncryption
-         78:e3:4f:d2:0f:56:13:0d:a3:5d:1a:68:d7:64:f5:60:d2:37:
-         7e:94:d7:4d:d3:5f:11:27:e8:0b:2c:74:6f:23:08:24:94:ba:
-         fc:b8:8a:33:3f:99:18:83:cd:4f:14:3a:82:f9:ba:f3:ff:2c:
-         b1:f5:c9:be:af:fd:16:79:bd:cf:39:ba:5c:47:88:b1:b1:23:
-         6b:6d:1c:67:5d:98:52:58:1d:72:ee:7e:c5:4b:e4:03:ca:ba:
-         47:bf:89:c5:48:c2:b1:0b:9c:3e:ed:3e:04:19:62:66:4c:c6:
-         44:6f:db:33:20:14:b1:df:c1:8f:3a:21:c1:59:0e:f8:70:3c:
-         fe:e0:ad:77:7b:5d:8c:de:a3:cd:d0:5c:84:36:10:00:42:28:
-         ee:7c:32:28:4d:41:94:3c:e4:36:7e:e5:d2:b3:d9:6f:f3:f5:
-         63:24:3f:9f:c6:64:cc:32:23:7e:fd:00:f4:c3:89:ac:5f:28:
-         f2:a3:af:a9:21:47:b1:f4:48:7c:79:6d:e7:6e:b8:35:15:ea:
-         6d:f2:13:35:8f:56:ea:e6:47:fb:a9:b4:f6:64:ee:b9:e8:07:
-         73:de:ef:20:c0:36:a9:10:bf:4a:df:29:90:fb:fc:05:85:f0:
-         62:94:7e:74:3a:42:cb:01:3d:ef:65:82:48:b8:87:8e:0e:17:
-         cb:6c:a0:dc
+    Signature Value:
+        33:bb:fa:5f:59:e5:d0:5c:a1:22:4e:73:c8:35:e4:d7:8c:28:
+        67:b2:85:b0:1b:0c:e4:ec:aa:a7:49:09:e7:52:63:e5:8a:51:
+        a9:de:b8:35:74:66:0f:66:fa:b4:91:1f:b0:3a:5e:0a:21:0d:
+        a2:73:5b:1f:2c:fa:cd:59:72:85:8c:db:95:33:66:64:a2:e7:
+        6f:0d:9e:cf:a7:e3:de:82:7a:24:55:56:f8:b8:c0:95:0d:ba:
+        07:01:fe:ce:35:48:2f:23:2d:29:7b:6b:00:e6:f7:2c:31:6f:
+        9c:67:35:90:f0:65:9f:41:f9:bf:ad:2c:e9:8e:f0:c4:cf:8c:
+        5d:02:c4:8e:22:7f:62:bb:62:21:cf:9d:59:7b:96:4e:c4:7d:
+        ca:a2:6f:37:66:34:88:ac:a3:c1:6e:95:ec:e3:3a:07:27:6d:
+        31:b7:38:70:ce:93:42:86:20:3b:f8:d8:f9:ef:a9:9e:43:4f:
+        ed:9b:4b:c7:90:5b:d1:9b:16:66:8f:42:11:8a:97:bb:c7:e1:
+        b5:67:f5:a1:f4:7b:8b:f0:88:a8:5f:39:83:4c:2e:3d:e9:8f:
+        34:b8:fb:e8:1e:e2:0f:90:02:7c:ad:c7:9e:00:c2:fa:0a:41:
+        43:61:e2:2b:6d:f8:b7:fa:70:71:04:f3:2c:7f:c0:16:7a:6b:
+        a1:34:45:c0
 
 -----BEGIN CERTIFICATE-----
-MIIGwTCCBamgAwIBAgIQCNyTVTZtxZIg0KNMoRmrLTANBgkqhkiG9w0BAQsFADBP
+MIIGxDCCBaygAwIBAgIQDvuL9HM+mN8dSG3a0gjKDTANBgkqhkiG9w0BAQsFADBP
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMSkwJwYDVQQDEyBE
-aWdpQ2VydCBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMTAeFw0yMTA0MjcwMDAwMDBa
-Fw0yMjA1MjUyMzU5NTlaMGcxCzAJBgNVBAYTAlVTMREwDwYDVQQIEwhOZXcgWW9y
+aWdpQ2VydCBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMTAeFw0yMjA1MDUwMDAwMDBa
+Fw0yMzA2MDIyMzU5NTlaMGcxCzAJBgNVBAYTAlVTMREwDwYDVQQIEwhOZXcgWW9y
 azERMA8GA1UEBxMITmV3IFlvcmsxFjAUBgNVBAoTDU1vbmdvREIsIEluYy4xGjAY
 BgNVBAMMESoubW9uZ29kYi1kZXYubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAu8He9gg5+/Ga99RoateBVwwJuY855cixU1LYZAzhkpzKP5JGhlzi
-jyDP+ZnQlUZRflX3PWIbpOd5MQw5nSO8AG8vPV/UiBvQnEImRRsRstdF9aovB0Pa
-vKtDywsSWUEkw7uGfy0aySbXayVXSJyIGiD7ZQFxJwwkpyNA3LZpTVXvFLq9BbbP
-XrDC9la8iOmBBJSAm8/u8xUFeWFBIUqhIylmkOnXAx5PML2BRuSbqx/4AlxYmEjF
-UBYWgA0lvlMnqovKbNXZiVArOKZV/sMKatucHiOihJNP0aE9AEirwSo8ClmoW9SI
-MlSp3ojeGoLvYfqQ+kI9HaiY1jul1OvGzwIDAQABo4IDfzCCA3swHwYDVR0jBBgw
-FoAUt2ui6qiqhIx56rTaD5iyxZV2ufQwHQYDVR0OBBYEFD0jMR7qHI2KCaotKoS/
-BjHehwQBMC0GA1UdEQQmMCSCESoubW9uZ29kYi1kZXYubmV0gg9tb25nb2RiLWRl
+MIIBCgKCAQEAs0DrSiavB6PqWMc7UFyUR1oKnYa3uwOcWkojXnyxzfxPVtUFTs74
+8rFVCRP/zOak+0EuDI8ao+pLo1HG95HmR0muO5TfaIBoKmKi0UJbicFwKxynhN+Y
+hhpp64jEUU3JfxCQoArFfAcSnsKU4YguLSGUpIonHyAbbxQnIQxLb3JbGOd1epBM
+qBjnTQ/t5AP0ELdlI5+yXw3rhTywNNOaLICFLlM1GUQDE7Pf+w3bgG8SYBq41iUN
+bSP9ptiq3IJzzNImm3FQmgnP72C60SLL+y9poqbGqTB3HNe8wm5t5mll85E97gT5
+oEFfUNx1FU0VQ3Y16Zdletg/AE1EKXxdJQIDAQABo4IDgjCCA34wHwYDVR0jBBgw
+FoAUt2ui6qiqhIx56rTaD5iyxZV2ufQwHQYDVR0OBBYEFCJ8L8f01nUOoQIyIRqm
+KSVGSLhqMC0GA1UdEQQmMCSCESoubW9uZ29kYi1kZXYubmV0gg9tb25nb2RiLWRl
 di5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjCBiwYDVR0fBIGDMIGAMD6gPKA6hjhodHRwOi8vY3JsMy5kaWdpY2VydC5j
-b20vRGlnaUNlcnRUTFNSU0FTSEEyNTYyMDIwQ0ExLmNybDA+oDygOoY4aHR0cDov
-L2NybDQuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VExTUlNBU0hBMjU2MjAyMENBMS5j
-cmwwPgYDVR0gBDcwNTAzBgZngQwBAgIwKTAnBggrBgEFBQcCARYbaHR0cDovL3d3
-dy5kaWdpY2VydC5jb20vQ1BTMH0GCCsGAQUFBwEBBHEwbzAkBggrBgEFBQcwAYYY
-aHR0cDovL29jc3AuZGlnaWNlcnQuY29tMEcGCCsGAQUFBzAChjtodHRwOi8vY2Fj
-ZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRUTFNSU0FTSEEyNTYyMDIwQ0ExLmNy
-dDAMBgNVHRMBAf8EAjAAMIIBfgYKKwYBBAHWeQIEAgSCAW4EggFqAWgAdgApeb7w
-njk5IfBWc59jpXflvld9nGAK+PlNXSZcJV3HhAAAAXkVqUdqAAAEAwBHMEUCIEIg
-CSz4T5xNcAwdpjmh7CBLVEtQXrW5cR9rYLxlW+cPAiEAut5lgiZlfNcBfDZRcc/3
-LAl7x5of5G2OEX7bYFK8gosAdQAiRUUHWVUkVpY/oS/x922G4CMmY63AS39dxoNc
-buIPAgAAAXkVqUc2AAAEAwBGMEQCIAxrXH8xtSQQcyOvJyARWJ5Apmq72EgP0Urx
-+KmwMB40AiATBLWCKFnXC4Z/xiJunGf/8aOfv1SrDbgajhbS8Y43/wB3AFGjsPX9
-AXmcVm24N3iPDKR6zBsny/eeiEKaDf7UiwXlAAABeRWpSPgAAAQDAEgwRgIhAND+
-/sricoU6phPQ7VWLZ6+G9Ne+Zme7mb98EC0oDknDAiEAv/+6uE3Rt2pr6bPlppPK
-FDdwwU+JiWZYP6oisB75FN8wDQYJKoZIhvcNAQELBQADggEBAHjjT9IPVhMNo10a
-aNdk9WDSN36U103TXxEn6AssdG8jCCSUuvy4ijM/mRiDzU8UOoL5uvP/LLH1yb6v
-/RZ5vc85ulxHiLGxI2ttHGddmFJYHXLufsVL5APKuke/icVIwrELnD7tPgQZYmZM
-xkRv2zMgFLHfwY86IcFZDvhwPP7grXd7XYzeo83QXIQ2EABCKO58MihNQZQ85DZ+
-5dKz2W/z9WMkP5/GZMwyI379APTDiaxfKPKjr6khR7H0SHx5beduuDUV6m3yEzWP
-VurmR/uptPZk7rnoB3Pe7yDANqkQv0rfKZD7/AWF8GKUfnQ6QssBPe9lgki4h44O
-F8tsoNw=
+BQcDAjCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8vY3JsMy5kaWdpY2VydC5j
+b20vRGlnaUNlcnRUTFNSU0FTSEEyNTYyMDIwQ0ExLTQuY3JsMECgPqA8hjpodHRw
+Oi8vY3JsNC5kaWdpY2VydC5jb20vRGlnaUNlcnRUTFNSU0FTSEEyNTYyMDIwQ0Ex
+LTQuY3JsMD4GA1UdIAQ3MDUwMwYGZ4EMAQICMCkwJwYIKwYBBQUHAgEWG2h0dHA6
+Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB/BggrBgEFBQcBAQRzMHEwJAYIKwYBBQUH
+MAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBJBggrBgEFBQcwAoY9aHR0cDov
+L2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VExTUlNBU0hBMjU2MjAyMENB
+MS0xLmNydDAJBgNVHRMEAjAAMIIBfgYKKwYBBAHWeQIEAgSCAW4EggFqAWgAdgDo
+PtDaPvUGNTLnVyi8iWvJA9PL0RFr7Otp4Xd9bQa9bgAAAYCU/uZGAAAEAwBHMEUC
+IQDE2BoAPL3l4ROyXdp/aalMg6vMwgCf+5gJRF+TDJLN9wIgLeLWpDthBiUeIi9e
+KtR2Df4S6ZFlJmklbFPkwy9Lia8AdgA1zxkbv7FsV78PrUxtQsu7ticgJlHqP+Eq
+76gDwzvWTAAAAYCU/uaCAAAEAwBHMEUCIEbwnq4yp6fKIsZk7n+fxuo8vjsv4gnA
+7anh7hb58WweAiEAvRpCc6XO5orOvEw+QtQL/Ik71R4p6Dj3RFsimvods1cAdgC3
+Pvsk35xNunXyOcW6WPRsXfxCz3qfNcSeHQmBJe20mQAAAYCU/uZ7AAAEAwBHMEUC
+IC9ym8yIBPE7i7wBhbIWtK9Ky0XoCynRd2wsVgyNHGF8AiEApGesCECDgp4idTqS
+kR4SIwG5BDujYF/o0VlOiNvF3t0wDQYJKoZIhvcNAQELBQADggEBADO7+l9Z5dBc
+oSJOc8g15NeMKGeyhbAbDOTsqqdJCedSY+WKUaneuDV0Zg9m+rSRH7A6XgohDaJz
+Wx8s+s1ZcoWM25UzZmSi528Nns+n496CeiRVVvi4wJUNugcB/s41SC8jLSl7awDm
+9ywxb5xnNZDwZZ9B+b+tLOmO8MTPjF0CxI4if2K7YiHPnVl7lk7EfcqibzdmNIis
+o8FulezjOgcnbTG3OHDOk0KGIDv42PnvqZ5DT+2bS8eQW9GbFmaPQhGKl7vH4bVn
+9aH0e4vwiKhfOYNMLj3pjzS4++ge4g+QAnytx54AwvoKQUNh4itt+Lf6cHEE8yx/
+wBZ6a6E0RcA=
 -----END CERTIFICATE-----

data/spec/support/certificates/retrieve-atlas-cert

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+
+require 'tmpdir'
+
+host = 'freecluster-shard-00-00-oztdp.mongodb-dev.net'
+
+output = `openssl s_client -showcerts -servername #{host} -connect #{host}:27017 </dev/null`
+
+if output.empty?
+  raise 'Something bad happened'
+end
+
+certs = output.scan(/(-----BEGIN CERTIFICATE(.|\n)+?END CERTIFICATE-----)/)
+cert, ca_cert = certs.map { |g| g.first }
+
+Dir.mktmpdir do |path|
+  cert_path = File.join(path, 'cert.pem')
+  File.open(cert_path, 'w') do |f|
+    f << cert
+  end
+  output = `openssl x509 -noout -text -in #{cert_path}`
+  File.open('atlas-ocsp.crt', 'w') do |f|
+    f << output
+    f << "\n"
+    f << cert
+  end
+
+  cert_path = File.join(path, 'cert.pem')
+  File.open(cert_path, 'w') do |f|
+    f << ca_cert
+  end
+  output = `openssl x509 -noout -text -in #{cert_path}`
+  File.open('atlas-ocsp-ca.crt', 'w') do |f|
+    f << output
+    f << "\n"
+    f << ca_cert
+  end
+end

data/spec/support/cluster_tools.rb

@@ -55,7 +55,7 @@ class ClusterTools
       replSetStepDown: 1, force: true)
   end
 
-  # https://docs.mongodb.com/manual/reference/parameters/#param.enableElectionHandoff
+  # https://mongodb.com/docs/manual/reference/parameters/#param.enableElectionHandoff
   def set_election_handoff(value)
     unless [true, false].include?(value)
       raise ArgumentError, 'Value must be true or false'

data/spec/support/common_shortcuts.rb

@@ -370,5 +370,27 @@ module CommonShortcuts
         thread.join
       end
     end
+
+    # Wait for snapshot reads to become available to prevent this error:
+    # [246:SnapshotUnavailable]: Unable to read from a snapshot due to pending collection catalog changes; please retry the operation. Snapshot timestamp is Timestamp(1646666892, 4). Collection minimum is Timestamp(1646666892, 5) (on localhost:27017, modern retry, attempt 1)
+    def wait_for_snapshot(db: nil, collection: nil, client: nil)
+      client ||= authorized_client
+      client = client.use(db) if db
+      collection ||= 'any'
+      start_time = Mongo::Utils.monotonic_time
+      begin
+        client.start_session(snapshot: true) do |session|
+          client[collection].aggregate([{'$match': {any: true}}], session: session).to_a
+        end
+      rescue Mongo::Error::OperationFailure => e
+        # Retry them as the server demands...
+        if e.code == 246 # SnapshotUnavailable
+          if Mongo::Utils.monotonic_time < start_time + 10
+            retry
+          end
+        end
+        raise
+      end
+    end
   end
 end