GODRIVER-3173 Complete pending reads on conn checkout

.evergreen/config.yml

@@ -543,6 +543,17 @@ functions:
         binary: bash
         args: ["${DRIVERS_TOOLS}/.evergreen/csfle/await-servers.sh"]
 
+  start-mongoproxy:
+    - command: ec2.assume_role # TODO: not sure this is needd
+      params:
+        role_arn: ${aws_test_secrets_role}
+    - command: subprocess.exec
+      params:
+        binary: bash
+        include_expansions_in_env: [AUTH, SSL, MONGODB_URI]
+        background: true
+        args: [*task-runner, start-mongoproxy]
+
   run-kms-tls-test:
     - command: subprocess.exec
       type: test
@@ -658,6 +669,7 @@ tasks:
           AUTH: "noauth"
           SSL: "nossl"
       - func: start-cse-servers
+      - func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "server"
@@ -673,12 +685,14 @@ tasks:
           AUTH: "noauth"
           SSL: "nossl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "server"
           AUTH: "noauth"
           SSL: "nossl"
           MONGO_GO_DRIVER_COMPRESSOR: "snappy"
+          MONGO_PROXY_URI: "mongodb://127.0.0.1:28017/?directConnection=true"
 
   - name: test-standalone-noauth-nossl-zlib-compression
     tags: ["test", "standalone", "compression", "zlib"]
@@ -689,6 +703,7 @@ tasks:
           AUTH: "noauth"
           SSL: "nossl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "server"
@@ -705,6 +720,7 @@ tasks:
           AUTH: "noauth"
           SSL: "nossl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "server"
@@ -720,7 +736,8 @@ tasks:
           TOPOLOGY: "server"
           AUTH: "auth"
           SSL: "ssl"
-      - func: start-cse-servers
+      - func: start-cse-servers  
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "server"
@@ -736,6 +753,7 @@ tasks:
           AUTH: "auth"
           SSL: "nossl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "server"
@@ -751,6 +769,7 @@ tasks:
           AUTH: "auth"
           SSL: "ssl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "server"
@@ -766,7 +785,8 @@ tasks:
           TOPOLOGY: "server"
           AUTH: "auth"
           SSL: "ssl"
-      - func: start-cse-servers
+      - func: start-cse-servers  
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "server"
@@ -783,6 +803,7 @@ tasks:
           AUTH: "auth"
           SSL: "ssl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "server"
@@ -1203,6 +1224,7 @@ tasks:
           AUTH: "noauth"
           SSL: "nossl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "replica_set"
@@ -1219,6 +1241,7 @@ tasks:
           AUTH: "noauth"
           SSL: "nossl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "replica_set"
@@ -1234,6 +1257,7 @@ tasks:
           AUTH: "auth"
           SSL: "ssl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "replica_set"
@@ -1249,6 +1273,7 @@ tasks:
           AUTH: "auth"
           SSL: "ssl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "replica_set"
@@ -1267,6 +1292,7 @@ tasks:
           AUTH: "auth"
           SSL: "nossl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "replica_set"
@@ -1282,6 +1308,7 @@ tasks:
           AUTH: "noauth"
           SSL: "nossl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "sharded_cluster"
@@ -1297,6 +1324,7 @@ tasks:
           AUTH: "noauth"
           SSL: "nossl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "sharded_cluster"
@@ -1313,6 +1341,7 @@ tasks:
           AUTH: "noauth"
           SSL: "nossl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "sharded_cluster"
@@ -1329,6 +1358,7 @@ tasks:
           AUTH: "noauth"
           SSL: "nossl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "sharded_cluster"
@@ -1345,6 +1375,7 @@ tasks:
           AUTH: "auth"
           SSL: "ssl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "sharded_cluster"
@@ -1360,6 +1391,7 @@ tasks:
           AUTH: "auth"
           SSL: "ssl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "sharded_cluster"
@@ -1376,6 +1408,7 @@ tasks:
           AUTH: "auth"
           SSL: "ssl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "sharded_cluster"
@@ -1392,6 +1425,7 @@ tasks:
           AUTH: "auth"
           SSL: "ssl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "sharded_cluster"
@@ -1408,6 +1442,7 @@ tasks:
           AUTH: "auth"
           SSL: "nossl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-tests
         vars:
           TOPOLOGY: "sharded_cluster"
@@ -1479,6 +1514,7 @@ tasks:
           SSL: "nossl"
           REQUIRE_API_VERSION: true
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-versioned-api-test
         vars:
           TOPOLOGY: "server"
@@ -1496,6 +1532,7 @@ tasks:
           SSL: "nossl"
           REQUIRE_API_VERSION: true
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-versioned-api-test
         vars:
           TOPOLOGY: "sharded_cluster"
@@ -1513,6 +1550,7 @@ tasks:
           SSL: "nossl"
           ORCHESTRATION_FILE: "versioned-api-testing.json"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-versioned-api-test
         vars:
           TOPOLOGY: "server"
@@ -1528,6 +1566,7 @@ tasks:
           AUTH: "noauth"
           SSL: "nossl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-kms-tls-test
         vars:
           KMS_TLS_TESTCASE: "INVALID_CERT"
@@ -1544,6 +1583,7 @@ tasks:
           AUTH: "noauth"
           SSL: "nossl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-kms-tls-test
         vars:
           KMS_TLS_TESTCASE: "INVALID_HOSTNAME"
@@ -1560,6 +1600,7 @@ tasks:
           AUTH: "noauth"
           SSL: "nossl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-kmip-tests
         vars:
           TOPOLOGY: "server"
@@ -1575,12 +1616,14 @@ tasks:
           AUTH: "noauth"
           SSL: "nossl"
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: run-retry-kms-requests
 
   - name: "test-serverless"
     tags: ["serverless"]
     commands:
       - func: start-cse-servers
+      #- func: start-mongoproxy
       - func: "run-serverless-tests"
         vars:
           MONGO_GO_DRIVER_COMPRESSOR: "snappy"

.evergreen/run-task.sh

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 #
 # Source the env.sh file and run the given task
-set -eu
+set -exu
 
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
 PROJECT_DIRECTORY=$(dirname $SCRIPT_DIR)
-pushd ${PROJECT_DIRECTORY} > /dev/null
+pushd ${PROJECT_DIRECTORY} >/dev/null
 
 source env.sh
 task "$@"
 
-popd > /dev/null
+popd >/dev/null

.evergreen/setup-system.sh

@@ -4,7 +4,7 @@
 set -eu
 
 # Set up default environment variables.
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
 PROJECT_DIRECTORY=$(dirname $SCRIPT_DIR)
 pushd $PROJECT_DIRECTORY
 ROOT_DIR=$(dirname $PROJECT_DIRECTORY)
@@ -40,18 +40,19 @@ PATH="${GOROOT}/bin:${GOPATH}/bin:${MONGODB_BINARIES}:${EXTRA_PATH}:${PATH}"
 
 # Get the current unique version of this checkout.
 if [ "${IS_PATCH:-}" = "true" ]; then
-    CURRENT_VERSION=$(git describe)-patch-${VERSION_ID}
+  CURRENT_VERSION=$(git describe)-patch-${VERSION_ID}
 else
-    CURRENT_VERSION=latest
+  CURRENT_VERSION=latest
 fi
 
 # Ensure a checkout of drivers-tools.
 if [ ! -d "$DRIVERS_TOOLS" ]; then
-  git clone https://github.com/mongodb-labs/drivers-evergreen-tools $DRIVERS_TOOLS
+  #git clone https://github.com/mongodb-labs/drivers-evergreen-tools $DRIVERS_TOOLS
+  git clone -b DRIVERS-2884-mongoproxy https://github.com/prestonvasquez/drivers-evergreen-tools $DRIVERS_TOOLS
 fi
 
 # Write the .env file for drivers-tools.
-cat <<EOT > ${DRIVERS_TOOLS}/.env
+cat <<EOT >${DRIVERS_TOOLS}/.env
 SKIP_LEGACY_SHELL=1
 DRIVERS_TOOLS="$DRIVERS_TOOLS"
 MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
@@ -67,7 +68,7 @@ go env
 go install github.com/go-task/task/v3/cmd/[email protected]
 
 # Write our own env file.
-cat <<EOT > env.sh
+cat <<EOT >env.sh
 export GOROOT="$GOROOT"
 export GOPATH="$GOPATH"
 export GOCACHE="$GOCACHE"
@@ -78,12 +79,12 @@ export PATH="$PATH"
 EOT
 
 if [ "Windows_NT" = "$OS" ]; then
-    echo "export USERPROFILE=$USERPROFILE" >> env.sh
-    echo "export HOME=$HOME" >> env.sh
+  echo "export USERPROFILE=$USERPROFILE" >>env.sh
+  echo "export HOME=$HOME" >>env.sh
 fi
 
 # source the env.sh file and write the expansion file.
-cat <<EOT > expansion.yml
+cat <<EOT >expansion.yml
 CURRENT_VERSION: "$CURRENT_VERSION"
 DRIVERS_TOOLS: "$DRIVERS_TOOLS"
 PROJECT_DIRECTORY: "$PROJECT_DIRECTORY"

Taskfile.yml

@@ -123,6 +123,8 @@ tasks:
 
   setup-encryption: bash etc/setup-encryption.sh
 
+  start-mongoproxy: bash etc/start-mongoproxy.sh
+
   evg-test:
     - go test -exec "env PKG_CONFIG_PATH=${PKG_CONFIG_PATH} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} DYLD_LIBRARY_PATH=$MACOS_LIBRARY_PATH}" ${BUILD_TAGS} -v -timeout {{.TEST_TIMEOUT}}s -p 1 ./... >> test.suite
 

etc/start-mongoproxy.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+#
+# Set up environment and write env.sh and expansion.yml files.
+set -eux
+
+bash $DRIVERS_TOOLS/.evergreen/start-mongoproxy.sh