diff --git a/source/client-backpressure/tests/backpressure-retry-loop.json b/source/client-backpressure/tests/backpressure-retry-loop.json index f3717ca184..9121b21856 100644 --- a/source/client-backpressure/tests/backpressure-retry-loop.json +++ b/source/client-backpressure/tests/backpressure-retry-loop.json @@ -711,7 +711,7 @@ ] }, { - "description": "database.aggregate retries using operation loop", + "description": "database.aggregate read retries using operation loop", "operations": [ { "name": "failPoint", @@ -1480,7 +1480,7 @@ ] }, { - "description": "collection.aggregate retries using operation loop", + "description": "collection.aggregate read retries using operation loop", "operations": [ { "name": "failPoint", @@ -4734,7 +4734,7 @@ ] }, { - "description": "collection.aggregate retries using operation loop", + "description": "collection.aggregate write retries using operation loop", "operations": [ { "name": "failPoint", diff --git a/source/client-backpressure/tests/backpressure-retry-loop.yml b/source/client-backpressure/tests/backpressure-retry-loop.yml index d29e17d707..5b1f064641 100644 --- a/source/client-backpressure/tests/backpressure-retry-loop.yml +++ b/source/client-backpressure/tests/backpressure-retry-loop.yml @@ -366,7 +366,7 @@ tests: commandName: bulkWrite - - description: 'database.aggregate retries using operation loop' + - description: 'database.aggregate read retries using operation loop' operations: - name: failPoint object: testRunner @@ -743,7 +743,7 @@ tests: commandName: aggregate - - description: 'collection.aggregate retries using operation loop' + - description: 'collection.aggregate read retries using operation loop' operations: - name: failPoint object: testRunner @@ -2344,7 +2344,7 @@ tests: commandName: dropIndexes - - description: 'collection.aggregate retries using operation loop' + - description: 'collection.aggregate write retries using operation loop' operations: - name: failPoint object: testRunner diff --git a/source/client-backpressure/tests/backpressure-retry-loop.yml.template b/source/client-backpressure/tests/backpressure-retry-loop.yml.template index 6d807b1a5d..3504c5d157 100644 --- a/source/client-backpressure/tests/backpressure-retry-loop.yml.template +++ b/source/client-backpressure/tests/backpressure-retry-loop.yml.template @@ -84,7 +84,7 @@ _yamlAnchors: bulWriteInsertNamespace: &client_bulk_write_ns retryable-writes-tests.coll tests: {% for operation in operations %} - - description: '{{operation.object}}.{{operation.operation_name}} retries using operation loop' {%- if ((operation.operation_name == 'clientBulkWrite')) %} + - description: '{{operation.object}}.{{operation.operation_name}}{{ " " + operation.operation_type + "" if operation.operation_name == "aggregate" else "" }} retries using operation loop' {%- if ((operation.operation_name == 'clientBulkWrite')) %} runOnRequirements: - minServerVersion: '8.0' # client bulk write added to server in 8.0 {%- endif %} diff --git a/source/client-backpressure/tests/backpressure-retry-max-attempts.json b/source/client-backpressure/tests/backpressure-retry-max-attempts.json index 1e6f46f076..ed2352ca83 100644 --- a/source/client-backpressure/tests/backpressure-retry-max-attempts.json +++ b/source/client-backpressure/tests/backpressure-retry-max-attempts.json @@ -496,7 +496,7 @@ ] }, { - "description": "database.aggregate retries at most maxAttempts=5 times", + "description": "database.aggregate read retries at most maxAttempts=5 times", "operations": [ { "name": "failPoint", @@ -1026,7 +1026,7 @@ ] }, { - "description": "collection.aggregate retries at most maxAttempts=5 times", + "description": "collection.aggregate read retries at most maxAttempts=5 times", "operations": [ { "name": "failPoint", @@ -3448,7 +3448,7 @@ ] }, { - "description": "collection.aggregate retries at most maxAttempts=5 times", + "description": "collection.aggregate write retries at most maxAttempts=5 times", "operations": [ { "name": "failPoint", diff --git a/source/client-backpressure/tests/backpressure-retry-max-attempts.yml b/source/client-backpressure/tests/backpressure-retry-max-attempts.yml index 1cfabda6fd..36be3fb8f5 100644 --- a/source/client-backpressure/tests/backpressure-retry-max-attempts.yml +++ b/source/client-backpressure/tests/backpressure-retry-max-attempts.yml @@ -252,7 +252,7 @@ tests: - commandFailedEvent: commandName: bulkWrite - - description: 'database.aggregate retries at most maxAttempts=5 times' + - description: 'database.aggregate read retries at most maxAttempts=5 times' operations: - name: failPoint object: testRunner @@ -513,7 +513,7 @@ tests: - commandFailedEvent: commandName: aggregate - - description: 'collection.aggregate retries at most maxAttempts=5 times' + - description: 'collection.aggregate read retries at most maxAttempts=5 times' operations: - name: failPoint object: testRunner @@ -1711,7 +1711,7 @@ tests: - commandFailedEvent: commandName: dropIndexes - - description: 'collection.aggregate retries at most maxAttempts=5 times' + - description: 'collection.aggregate write retries at most maxAttempts=5 times' operations: - name: failPoint object: testRunner diff --git a/source/client-backpressure/tests/backpressure-retry-max-attempts.yml.template b/source/client-backpressure/tests/backpressure-retry-max-attempts.yml.template index b07630eec2..5620e491df 100644 --- a/source/client-backpressure/tests/backpressure-retry-max-attempts.yml.template +++ b/source/client-backpressure/tests/backpressure-retry-max-attempts.yml.template @@ -41,7 +41,7 @@ initialData: - { _id: 2, x: 22 } tests: {% for operation in operations %} - - description: '{{operation.object}}.{{operation.operation_name}} retries at most maxAttempts=5 times' + - description: '{{operation.object}}.{{operation.operation_name}}{{ " " + operation.operation_type + "" if operation.operation_name == "aggregate" else "" }} retries at most maxAttempts=5 times' {%- if ((operation.operation_name == 'clientBulkWrite')) %} runOnRequirements: - minServerVersion: '8.0' # client bulk write added to server in 8.0