From cb3b4614e45133fa77ec9d5e334132675d83c464 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 5 Feb 2024 15:47:14 -0600 Subject: [PATCH 1/7] GODRIVER-3113 Skip unpin_after_TransientTransactionError_error_on_commit on latest --- testdata/transactions/unified/mongos-unpin.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testdata/transactions/unified/mongos-unpin.yml b/testdata/transactions/unified/mongos-unpin.yml index c13798acaa..8ffbe25a4c 100644 --- a/testdata/transactions/unified/mongos-unpin.yml +++ b/testdata/transactions/unified/mongos-unpin.yml @@ -38,6 +38,8 @@ tests: # serverless proxy doesn't append error labels to errors in transactions # caused by failpoints (CLOUDP-88216) - serverless: "forbid" + # Workaround for GODRIVER-3113 + maxServerVersion: '7.99' operations: - &startTransaction name: startTransaction From f8e634949cd833ae8507d4335cab589697143273 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 5 Feb 2024 16:14:01 -0600 Subject: [PATCH 2/7] try top level skip --- testdata/transactions/unified/mongos-unpin.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testdata/transactions/unified/mongos-unpin.yml b/testdata/transactions/unified/mongos-unpin.yml index 8ffbe25a4c..9b1af5f9fc 100644 --- a/testdata/transactions/unified/mongos-unpin.yml +++ b/testdata/transactions/unified/mongos-unpin.yml @@ -4,6 +4,8 @@ schemaVersion: '1.4' runOnRequirements: - minServerVersion: '4.2' + # Workaround for GODRIVER-3113 + maxServerVersion: '7.99' topologies: [ sharded-replicaset ] createEntities: @@ -38,8 +40,6 @@ tests: # serverless proxy doesn't append error labels to errors in transactions # caused by failpoints (CLOUDP-88216) - serverless: "forbid" - # Workaround for GODRIVER-3113 - maxServerVersion: '7.99' operations: - &startTransaction name: startTransaction From 0970d02c239d7bc76738a718aac85cfef537269b Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 5 Feb 2024 18:03:44 -0600 Subject: [PATCH 3/7] try setting in json --- testdata/transactions/unified/mongos-unpin.json | 3 ++- testdata/transactions/unified/mongos-unpin.yml | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/testdata/transactions/unified/mongos-unpin.json b/testdata/transactions/unified/mongos-unpin.json index 4f7ae43794..c0c6cc018a 100644 --- a/testdata/transactions/unified/mongos-unpin.json +++ b/testdata/transactions/unified/mongos-unpin.json @@ -52,7 +52,8 @@ "description": "unpin after TransientTransactionError error on commit", "runOnRequirements": [ { - "serverless": "forbid" + "serverless": "forbid", + "maxServerVersion": "7.99" } ], "operations": [ diff --git a/testdata/transactions/unified/mongos-unpin.yml b/testdata/transactions/unified/mongos-unpin.yml index 9b1af5f9fc..c13798acaa 100644 --- a/testdata/transactions/unified/mongos-unpin.yml +++ b/testdata/transactions/unified/mongos-unpin.yml @@ -4,8 +4,6 @@ schemaVersion: '1.4' runOnRequirements: - minServerVersion: '4.2' - # Workaround for GODRIVER-3113 - maxServerVersion: '7.99' topologies: [ sharded-replicaset ] createEntities: From c75ffc6ccbee06d80f2919666ab6500e1b2846c4 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 7 Feb 2024 09:39:23 -0600 Subject: [PATCH 4/7] update skip conditions --- testdata/transactions/unified/mongos-unpin.json | 5 ++--- testdata/transactions/unified/mongos-unpin.yml | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/testdata/transactions/unified/mongos-unpin.json b/testdata/transactions/unified/mongos-unpin.json index c0c6cc018a..a96bb25518 100644 --- a/testdata/transactions/unified/mongos-unpin.json +++ b/testdata/transactions/unified/mongos-unpin.json @@ -4,6 +4,7 @@ "runOnRequirements": [ { "minServerVersion": "4.2", + "maxServerVersion": "7.99", "topologies": [ "sharded-replicaset" ] @@ -52,9 +53,7 @@ "description": "unpin after TransientTransactionError error on commit", "runOnRequirements": [ { - "serverless": "forbid", - "maxServerVersion": "7.99" - } + "serverless": "forbid" ], "operations": [ { diff --git a/testdata/transactions/unified/mongos-unpin.yml b/testdata/transactions/unified/mongos-unpin.yml index c13798acaa..59a7895f44 100644 --- a/testdata/transactions/unified/mongos-unpin.yml +++ b/testdata/transactions/unified/mongos-unpin.yml @@ -4,6 +4,8 @@ schemaVersion: '1.4' runOnRequirements: - minServerVersion: '4.2' + # Skip pending GODRIVER-3113 + maxServerVersion: "7.99" topologies: [ sharded-replicaset ] createEntities: From 54e3012b5e9ccf680957f8340b8346e7c1d6db58 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 7 Feb 2024 09:45:08 -0600 Subject: [PATCH 5/7] update csfle script names --- .evergreen/config.yml | 2 +- etc/setup-encryption.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 92d7983a3a..639973a337 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -863,7 +863,7 @@ functions: working_dir: src/go.mongodb.org/mongo-driver binary: bash args: - - ${DRIVERS_TOOLS}/.evergreen/csfle/await_servers.sh + - ${DRIVERS_TOOLS}/.evergreen/csfle/await-servers.sh run-kms-tls-test: - command: shell.exec diff --git a/etc/setup-encryption.sh b/etc/setup-encryption.sh index 8a049415f1..d8ab0e855f 100644 --- a/etc/setup-encryption.sh +++ b/etc/setup-encryption.sh @@ -16,5 +16,5 @@ export CSFLE_TLS_CA_FILE="${PARENT_DIR}/testdata/kmip-certs/ca-ec.pem" export CSFLE_TLS_CERT_FILE="${PARENT_DIR}/testdata/kmip-certs/server-ec.pem" export CSFLE_TLS_CLIENT_CERT_FILE="${PARENT_DIR}/testdata/kmip-certs/client-ec.pem" -bash $DRIVERS_TOOLS/.evergreen/csfle/setup_secrets.sh -bash $DRIVERS_TOOLS/.evergreen/csfle/start_servers.sh +bash $DRIVERS_TOOLS/.evergreen/csfle/setup-secrets.sh +bash $DRIVERS_TOOLS/.evergreen/csfle/start-servers.sh From bbe391385f3b342ab6b2eee9d752fd711d9934b4 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 7 Feb 2024 09:49:53 -0600 Subject: [PATCH 6/7] fix syntax --- testdata/transactions/unified/mongos-unpin.json | 1 + 1 file changed, 1 insertion(+) diff --git a/testdata/transactions/unified/mongos-unpin.json b/testdata/transactions/unified/mongos-unpin.json index a96bb25518..4bb8548f48 100644 --- a/testdata/transactions/unified/mongos-unpin.json +++ b/testdata/transactions/unified/mongos-unpin.json @@ -54,6 +54,7 @@ "runOnRequirements": [ { "serverless": "forbid" + } ], "operations": [ { From 4d1bc80d6f88156cf0c9f756f74966b98a08179f Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 7 Feb 2024 09:54:04 -0600 Subject: [PATCH 7/7] Revert "update csfle script names" This reverts commit 54e3012b5e9ccf680957f8340b8346e7c1d6db58. --- .evergreen/config.yml | 2 +- etc/setup-encryption.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 639973a337..92d7983a3a 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -863,7 +863,7 @@ functions: working_dir: src/go.mongodb.org/mongo-driver binary: bash args: - - ${DRIVERS_TOOLS}/.evergreen/csfle/await-servers.sh + - ${DRIVERS_TOOLS}/.evergreen/csfle/await_servers.sh run-kms-tls-test: - command: shell.exec diff --git a/etc/setup-encryption.sh b/etc/setup-encryption.sh index d8ab0e855f..8a049415f1 100644 --- a/etc/setup-encryption.sh +++ b/etc/setup-encryption.sh @@ -16,5 +16,5 @@ export CSFLE_TLS_CA_FILE="${PARENT_DIR}/testdata/kmip-certs/ca-ec.pem" export CSFLE_TLS_CERT_FILE="${PARENT_DIR}/testdata/kmip-certs/server-ec.pem" export CSFLE_TLS_CLIENT_CERT_FILE="${PARENT_DIR}/testdata/kmip-certs/client-ec.pem" -bash $DRIVERS_TOOLS/.evergreen/csfle/setup-secrets.sh -bash $DRIVERS_TOOLS/.evergreen/csfle/start-servers.sh +bash $DRIVERS_TOOLS/.evergreen/csfle/setup_secrets.sh +bash $DRIVERS_TOOLS/.evergreen/csfle/start_servers.sh