CDRIVER-4645 add `mock-server-test` variant #1277

kevinAlbs · 2023-05-21T15:51:24Z

Summary

This PR partially resolves CDRIVER-4645.

Remove some unused tasks from legacy Evergreen config.
Add a mock-server-test variant.

Here is a patch build for the new mock-server-test variant: https://spruce.mongodb.com/version/646a3d470305b97abfa79790

Unused tasks

This validate.py script can print unused tasks. Before these changes, this is the output:

% evergreen evaluate ./.evergreen/config.yml > evaluated.yml
% python validate.py                                        
`tasks` not referenced in `buildvariants` or `task_groups`:
-authentication-tests-openssl-static
-debug-compile-asan-clang
-debug-compile-asan-clang-openssl
-debug-compile-asan-openssl-cse
-debug-compile-compression
-debug-compile-sasl-darwinssl-cse
-debug-compile-sasl-nossl
-debug-compile-sasl-openssl-cse
-debug-compile-sasl-openssl-static-cse
-debug-compile-sasl-winssl
-debug-compile-sasl-winssl-cse
-debug-compile-sspi-nossl
-debug-compile-sspi-openssl
-debug-compile-sspi-openssl-static
-test-asan-memcheck-mock-server
-test-aws-openssl-assume_role-5.0
-test-aws-openssl-ec2-5.0
-test-aws-openssl-ecs-5.0
-test-aws-openssl-lambda-5.0
-test-aws-openssl-regular-5.0
-test-latest-server-compression
-test-loadbalanced-asan-auth-openssl-5.0
-test-loadbalanced-asan-auth-openssl-latest
-test-loadbalanced-asan-noauth-nossl-5.0
-test-loadbalanced-asan-noauth-nossl-latest

Here is the rationale for the tasks that were removed in this PR:

authentication-tests-openssl-static
- Removed. Copying rationale from CDRIVER-3620 Add SASL, CSE, and Sanitizers matrices #1201 (comment):
IMO there is little value (if any) in testing both openssl and openssl_static. The only value would be from verifying the C driver can compile and link to both openssl and openssl_static.
debug-compile-asan-openssl-cse
- Seems redundant with asan-cse-sasl-cyrus-openssl-ubuntu1804-clang-compile.
debug-compile-sasl-darwinssl-cse
- Seems redundant with cse-sasl-cyrus-darwinssl-macos-1100-clang-compile.
debug-compile-sasl-openssl-cse
- Seems redundant with cse-sasl-cyrus-openssl-* tasks.
debug-compile-sasl-winssl
- Seems redundant with sasl-cyrus-winssl-* tasks.
debug-compile-sasl-winssl-cse
- Seems redundant with cse-sasl-cyrus-winssl-* tasks.
test-asan-memcheck-mock-server
- Replaced by the new mock-server-test task.

The remaining tasks may still provide value and have not been removed. They may be used or migrated in a future PR.

Adding the mock-server-test variant

The mock-server-test has been added to the new Evergreen config generator. It uses the ubuntu2204-small distro to agree with suggestions in Guidelines around Evergreen distros. gcc is used since clang does not appear installed on ubuntu2204 distros:

[2023/05/19 20:05:04.811] CMake Error at /home/ubuntu/.cache/mongo-c-driver/tmp.vxxXctRSNK/cmake-3.25.2-linux-x86_64/share/cmake-3.25/Modules/CMakeDetermineCCompiler.cmake:49 (message):
[2023/05/19 20:05:04.811]   Could not find compiler set in environment variable CC:
[2023/05/19 20:05:04.811]   clang.

The mock-server-test variant has been added to the GitHub Patch Definitions to run the task on each GitHub PR.

Seems redundant with `asan-cse-sasl-cyrus-openssl-ubuntu1804-clang-compile`

Seems redundant with `cse-sasl-cyrus-darwinssl-macos-1100-clang-compile`.

Seems redundant with `cse-sasl-cyrus-openssl-*` tasks.

Seems redundant with `sasl-cyrus-winssl-*` tasks.

Seems redundant with `cse-sasl-cyrus-winssl-*` tasks.

CDRIVER-4193 changes to use OP_MSG and hello for handshake when in loadbalanced

Replaced by the new `mock-server-test` task.

eramongodb

Minor suggestions; otherwise, LGTM.

eramongodb · 2023-05-22T17:25:39Z

src/libmongoc/tests/test-mongoc-loadbalanced.c

-      mock_server_receives_legacy_hello (server, "{'loadBalanced': true}");
+   request = mock_server_receives_hello_op_msg (server);
+   const bson_t *match_loadBalanced = tmp_bson ("{'loadBalanced': true}");
+   ASSERT (request_matches_msg (request, MONGOC_MSG_NONE, &match_loadBalanced, 1));


Suggested change

ASSERT (request_matches_msg (request, MONGOC_MSG_NONE, &match_loadBalanced, 1));

ASSERT (

request_matches_msg (request, MONGOC_MSG_NONE, &match_loadBalanced, 1));

This file has not been formatted.

eramongodb · 2023-05-22T17:27:39Z

src/libmongoc/tests/test-mongoc-loadbalanced.c

-   request =
-      mock_server_receives_legacy_hello (server, "{'loadBalanced': true}");
+   request = mock_server_receives_hello_op_msg (server);
+   const bson_t *match_loadBalanced = tmp_bson ("{'loadBalanced': true}");


Suggest moving reused variable up above outside the current "test block" to denote its value is not specific to this block.

eramongodb · 2023-05-22T17:31:49Z

.evergreen/legacy_config_generator/evergreen_config_lib/tasks.py

-            "test-asan-memcheck-mock-server",
-            tags=["test-asan"],
-            get_build="debug-compile-asan-clang",
-            commands=[func("run mock server tests", ASAN="on", SSL="ssl")],


Remove "run mock server tests" function in legacy config generator functions.py.

kevinAlbs added 11 commits May 18, 2023 16:06

remove unused TOPOLOGY

9e942c2

remove authentication-tests-openssl-static

76c6fa1

remove debug-compile-asan-openssl-cse

87a5547

Seems redundant with `asan-cse-sasl-cyrus-openssl-ubuntu1804-clang-compile`

remove debug-compile-sasl-darwinssl-cse

8f7e39b

Seems redundant with `cse-sasl-cyrus-darwinssl-macos-1100-clang-compile`.

remove debug-compile-sasl-openssl-cse

f4ddf21

Seems redundant with `cse-sasl-cyrus-openssl-*` tasks.

remove debug-compile-sasl-winssl

6785486

Seems redundant with `sasl-cyrus-winssl-*` tasks.

remove debug-compile-sasl-winssl-cse

fee77c1

Seems redundant with `cse-sasl-cyrus-winssl-*` tasks.

add TestSuite_CheckLive to /counters tests

eac5fde

expect hello and OP_MSG for load balanced tests

785fbaf

CDRIVER-4193 changes to use OP_MSG and hello for handshake when in loadbalanced

add mock-server-test variant

92faa4a

remove test-asan-memcheck-mock-server

4842907

Replaced by the new `mock-server-test` task.

kevinAlbs marked this pull request as ready for review May 22, 2023 16:45

kevinAlbs requested a review from eramongodb May 22, 2023 16:45

eramongodb approved these changes May 22, 2023

View reviewed changes

kevinAlbs added 3 commits May 23, 2023 12:34

format test-mongoc-loadbalanced.c

d2ab768

move match_loadBalanced declarations up

c4f89b6

remove run mock server tests from legacy config

62baae0

kevinAlbs merged commit b9ca36f into mongodb:master May 23, 2023

This was referenced Oct 5, 2023

CDRIVER-4345 unskip /change_stream/resumable_error #1432

Merged

CDRIVER-4350 unskip mock tests and remove unnecessary skips #1437

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

CDRIVER-4645 add `mock-server-test` variant #1277

CDRIVER-4645 add `mock-server-test` variant #1277

Uh oh!

kevinAlbs commented May 21, 2023 •

edited

Loading

Uh oh!

eramongodb left a comment

Uh oh!

eramongodb May 22, 2023

Uh oh!

eramongodb May 22, 2023

Uh oh!

eramongodb May 22, 2023

Uh oh!

Uh oh!

	ASSERT (request_matches_msg (request, MONGOC_MSG_NONE, &match_loadBalanced, 1));
	ASSERT (
	request_matches_msg (request, MONGOC_MSG_NONE, &match_loadBalanced, 1));

CDRIVER-4645 add mock-server-test variant #1277

CDRIVER-4645 add mock-server-test variant #1277

Uh oh!

Conversation

kevinAlbs commented May 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Unused tasks

Adding the mock-server-test variant

Uh oh!

eramongodb left a comment

Choose a reason for hiding this comment

Uh oh!

eramongodb May 22, 2023

Choose a reason for hiding this comment

Uh oh!

eramongodb May 22, 2023

Choose a reason for hiding this comment

Uh oh!

eramongodb May 22, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

CDRIVER-4645 add `mock-server-test` variant #1277

CDRIVER-4645 add `mock-server-test` variant #1277

kevinAlbs commented May 21, 2023 •

edited

Loading