RUBY-2523 Client Side Operations Timeout (mongodb#2882)

comandeo-mongo · Aug 8, 2024 · 56100d6 · 56100d6
1 parent c7b5736
commit 56100d6
Show file tree

Hide file tree

Showing 234 changed files with 23,963 additions and 2,093 deletions.
diff --git a/.evergreen/aws_lambda b/.evergreen/aws_lambda
@@ -0,0 +1 @@
+../.mod/drivers-evergreen-tools/.evergreen/aws_lambda
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -168,6 +168,25 @@ functions:
 
           EOT
 
+  "run CSOT tests":
+    - command: shell.exec
+      type: test
+      params:
+        shell: bash
+        working_dir: "src"
+        script: |
+          ${PREPARE_SHELL}
+          # Needed for generating temporary aws credentials.
+          if [ -n "${FLE}" ];
+          then
+            export AWS_ACCESS_KEY_ID="${fle_aws_key}"
+            export AWS_SECRET_ACCESS_KEY="${fle_aws_secret}"
+            export AWS_DEFAULT_REGION="${fle_aws_region}"
+          fi
+          export CSOT_SPEC_TESTS=1
+          TEST_CMD="bundle exec rspec spec/spec_tests/client_side_operations_timeout_spec.rb" \
+            .evergreen/run-tests.sh
+
   "export FLE credentials":
     - command: shell.exec
       type: test
@@ -748,6 +767,9 @@ tasks:
   - name: "test-kerberos"
     commands:
       - func: "run Kerberos unit tests"
+  - name: "test-csot"
+    commands:
+      - func: "run CSOT tests"
   - name: "test-fle"
     commands:
       - func: "export FLE credentials"
@@ -863,6 +885,7 @@ tasks:
             AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
             AWS_SESSION_TOKEN: ${AWS_SESSION_TOKEN}
             LAMBDA_STACK_NAME: "dbx-ruby-lambda"
+            CLUSTER_PREFIX: "dbx-ruby-lambda"
             RVM_RUBY: ruby-3.2
             MONGODB_URI: ${MONGODB_URI}
 axes:
@@ -941,6 +964,10 @@ axes:
         display_name: Replica Set
         variables:
           TOPOLOGY: replica-set
+      - id: "replica-set-single-node"
+        display_name: Replica Set (Single Node)
+        variables:
+          TOPOLOGY: replica-set-single-node
       - id: "sharded-cluster"
         display_name: Sharded
         variables:
@@ -1373,6 +1400,16 @@ buildvariants:
     tasks:
       - name: "test-mlaunch"
 
+  - matrix_name: CSOT
+    matrix_spec:
+      ruby: "ruby-3.2"
+      mongodb-version: "7.0"
+      topology: replica-set-single-node
+      os: rhel8
+    display_name: "CSOT - ${mongodb-version}"
+    tasks:
+      - name: test-csot
+
   - matrix_name: "no-retry-reads"
     matrix_spec:
       retry-reads: no-retry-reads
@@ -1411,7 +1448,7 @@ buildvariants:
       lint: on
       ruby: "ruby-3.2"
       mongodb-version: "7.0"
-      topology: '*'
+      topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
     display_name: "${mongodb-version} ${topology} ${lint} ${ruby}"
     tasks:
@@ -1840,11 +1877,9 @@ buildvariants:
 
   - matrix_name: "serverless"
     matrix_spec:
-      # https://jira.mongodb.org/browse/RUBY-3217
-      # ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "jruby-9.4", "jruby-9.3"]
-      ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7"]
+      ruby: "ruby-3.2"
       fle: path
-      os: rhel8
+      os: ubuntu2204
     display_name: "Atlas serverless ${ruby}"
     tasks:
        - name: serverless_task_group

diff --git a/.evergreen/config/axes.yml.erb b/.evergreen/config/axes.yml.erb
@@ -74,6 +74,10 @@ axes:
         display_name: Replica Set
         variables:
           TOPOLOGY: replica-set
+      - id: "replica-set-single-node"
+        display_name: Replica Set (Single Node)
+        variables:
+          TOPOLOGY: replica-set-single-node
       - id: "sharded-cluster"
         display_name: Sharded
         variables:

diff --git a/.evergreen/config/common.yml.erb b/.evergreen/config/common.yml.erb
@@ -165,6 +165,25 @@ functions:
 
           EOT
 
+  "run CSOT tests":
+    - command: shell.exec
+      type: test
+      params:
+        shell: bash
+        working_dir: "src"
+        script: |
+          ${PREPARE_SHELL}
+          # Needed for generating temporary aws credentials.
+          if [ -n "${FLE}" ];
+          then
+            export AWS_ACCESS_KEY_ID="${fle_aws_key}"
+            export AWS_SECRET_ACCESS_KEY="${fle_aws_secret}"
+            export AWS_DEFAULT_REGION="${fle_aws_region}"
+          fi
+          export CSOT_SPEC_TESTS=1
+          TEST_CMD="bundle exec rspec spec/spec_tests/client_side_operations_timeout_spec.rb" \
+            .evergreen/run-tests.sh
+
   "export FLE credentials":
     - command: shell.exec
       type: test
@@ -745,6 +764,9 @@ tasks:
   - name: "test-kerberos"
     commands:
       - func: "run Kerberos unit tests"
+  - name: "test-csot"
+    commands:
+      - func: "run CSOT tests"
   - name: "test-fle"
     commands:
       - func: "export FLE credentials"
@@ -860,5 +882,6 @@ tasks:
             AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
             AWS_SESSION_TOKEN: ${AWS_SESSION_TOKEN}
             LAMBDA_STACK_NAME: "dbx-ruby-lambda"
+            CLUSTER_PREFIX: "dbx-ruby-lambda"
             RVM_RUBY: ruby-3.2
             MONGODB_URI: ${MONGODB_URI}
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
@@ -33,6 +33,8 @@
 
   recent_mdb = %w( 6.0 5.3 )
   latest_5x_mdb = "5.3".inspect # so it gets quoted as a string
+
+  all_dbs = %w(latest 7.0 6.0 5.3 5.0 4.4 4.2 4.0 3.6)
 %>
 
 buildvariants:
@@ -142,6 +144,16 @@ buildvariants:
     tasks:
       - name: "test-mlaunch"
 
+  - matrix_name: CSOT
+    matrix_spec:
+      ruby: <%= latest_ruby %>
+      mongodb-version: <%= latest_stable_mdb %>
+      topology: replica-set-single-node
+      os: rhel8
+    display_name: "CSOT - ${mongodb-version}"
+    tasks:
+      - name: test-csot
+
   - matrix_name: "no-retry-reads"
     matrix_spec:
       retry-reads: no-retry-reads
@@ -180,7 +192,7 @@ buildvariants:
       lint: on
       ruby: <%= latest_ruby %>
       mongodb-version: <%= latest_stable_mdb %>
-      topology: '*'
+      topology: <%= topologies %>
       os: rhel8
     display_name: "${mongodb-version} ${topology} ${lint} ${ruby}"
     tasks:
@@ -512,11 +524,9 @@ buildvariants:
 
   - matrix_name: "serverless"
     matrix_spec:
-      # https://jira.mongodb.org/browse/RUBY-3217
-      # ruby: <%= supported_rubies %>
-      ruby: <%= supported_mri_rubies %>
+      ruby: <%= latest_ruby %>
       fle: path
-      os: rhel8
+      os: ubuntu2204
     display_name: "Atlas serverless ${ruby}"
     tasks:
        - name: serverless_task_group

diff --git a/.evergreen/handle-paths.sh b/.evergreen/handle-paths.sh
@@ -0,0 +1 @@
+../.mod/drivers-evergreen-tools/.evergreen/handle-paths.sh
diff --git a/.evergreen/run-deployed-lambda-aws-tests.sh b/.evergreen/run-deployed-lambda-aws-tests.sh
diff --git a/.evergreen/run-tests-deployed-lambda.sh b/.evergreen/run-tests-deployed-lambda.sh
@@ -14,4 +14,4 @@ export MONGODB_URI=${MONGODB_URI}
 export CLUSTER_PREFIX="ruby-driver-"
 export TEST_LAMBDA_DIRECTORY=`dirname "$0"`/../spec/faas/ruby-sam-app
 
-. `dirname "$0"`/run-deployed-lambda-aws-tests.sh
+. `dirname "$0"`/aws_lambda/run-deployed-lambda-aws-tests.sh
diff --git a/.evergreen/run-tests-serverless.sh b/.evergreen/run-tests-serverless.sh
@@ -25,16 +25,16 @@ else
     python3 -u .evergreen/mongodl.py --component crypt_shared -V ${SERVERLESS_MONGODB_VERSION} --out `pwd`/csfle_lib  --target `host_distro` || true
     if test -f `pwd`/csfle_lib/lib/mongo_crypt_v1.so
     then
-        echo Usinn crypt shared library version ${SERVERLESS_MONGODB_VERSION}
+        echo Using crypt shared library version ${SERVERLESS_MONGODB_VERSION}
         export MONGO_RUBY_DRIVER_CRYPT_SHARED_LIB_PATH=`pwd`/csfle_lib/lib/mongo_crypt_v1.so
     else
         echo Failed to download crypt shared library
         exit -1
     fi
 fi
 
-if ! ( test -f /etc/os-release & grep -q ^ID.*rhel /etc/os-release & grep -q ^VERSION_ID.*8.0 /etc/os-release ); then
-    echo Serverless tests assume rhel80
+if ! ( test -f /etc/os-release & grep -q ^ID.*ubuntu /etc/os-release & grep -q ^VERSION_ID.*22.04 /etc/os-release ); then
+    echo Serverless tests assume ubuntu2204
     echo If this has changed, update .evergreen/run-tests-serverless.sh as necessary
     exit -1
 fi
@@ -43,8 +43,8 @@ mkdir libmongocrypt
 cd libmongocrypt
 curl --retry 3 -fLo libmongocrypt-all.tar.gz "https://s3.amazonaws.com/mciuploads/libmongocrypt/all/master/latest/libmongocrypt-all.tar.gz"
 tar xf libmongocrypt-all.tar.gz
-# We assume that serverless tests always use rhel80
-export LIBMONGOCRYPT_PATH=`pwd`/rhel-80-64-bit/nocrypto/lib64/libmongocrypt.so
+# We assume that serverless tests always use ubuntu2204
+export LIBMONGOCRYPT_PATH=`pwd`/ubuntu2204-64/nocrypto/lib/libmongocrypt.so
 cd -
 
 cd .evergreen/csfle

diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
@@ -65,6 +65,7 @@ fi
 
 calculate_server_args
 launch_ocsp_mock
+
 launch_server "$dbdir"
 
 uri_options="$URI_OPTIONS"
@@ -90,6 +91,9 @@ elif test "$TOPOLOGY" = replica-set; then
   # or it can try to send the commands to secondaries.
   hosts=localhost:27017,localhost:27018
   uri_options="$uri_options&replicaSet=test-rs"
+elif test "$TOPOLOGY" = replica-set-single-node; then
+  hosts=localhost:27017
+  uri_options="$uri_options&replicaSet=test-rs"
 else
   hosts=localhost:27017
 fi
@@ -283,7 +287,7 @@ fi
 
 set_fcv
 
-if test "$TOPOLOGY" = replica-set && ! echo "$MONGODB_VERSION" |fgrep -q 2.6; then
+if test "$TOPOLOGY" = replica-set || test "$TOPOLOGY" = replica-set-single-node; then
   ruby -Ilib -I.evergreen/lib -rbundler/setup -rserver_setup -e ServerSetup.new.setup_tags
 fi
 

diff --git a/.gitmodules b/.gitmodules
@@ -3,4 +3,4 @@
 	url = https://github.com/mongodb-labs/drivers-evergreen-tools
 [submodule "spec/shared"]
 	path = spec/shared
-	url = [email protected]:mongodb-labs/mongo-ruby-spec-shared.git
+        url = [email protected]:mongodb-labs/mongo-ruby-spec-shared.git
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../.mod/drivers-evergreen-tools/.evergreen/aws_lambda