CDRIVER-4275 and CDRIVER-4275 #1158
Conversation
This matches expectation of integration-tests.sh.
This was only needed when MongoDB servers did not return a serviceId in the hello response.
Tests were updated in mongodb/specifications commit: 5d1b42a05017ba27ffdbe6fd068a45e93e5b68c5
.evergreen/integration-tests.sh
Outdated
| @@ -61,6 +61,10 @@ if [ -z "$ORCHESTRATION_FILE" ]; then | |||
| if [ "$SSL" != "nossl" ]; then | |||
| ORCHESTRATION_FILE="${ORCHESTRATION_FILE}-ssl" | |||
| fi | |||
|
|
|||
| if [ -n "$LOAD_BALANCER" ]; then | |||
There was a problem hiding this comment.
I'm not super excited about using -n to test a variable that is set with the value true in config.yml. This seems to create the possibility that someone could think that setting LOAD_BALANCER=false would disable load balancer tests, but that would clearly not happen. I can't decide on a clearly better approach, but what about testing for = "on" as is done for IPV4_ONLY? The the on/off semantics seem a bit more natural.
There was a problem hiding this comment.
Agreed; suggest using same pattern as $IPV4_ONLY check above:
if [ "$LOAD_BALANCER" = "on" ]; thenAlso suggest adding LOAD_BALANCER=${LOAD_BALANCER:-off} above to document script parameters and default behavior.
Note: if this script is unconditionally executed in Bash, the VAR=${VAR:-value} pattern used above can be rewritten as:
: "${VAR:=value}"There was a problem hiding this comment.
This seems to create the possibility that someone could think that setting LOAD_BALANCER=false would disable load balancer tests, but that would clearly not happen.
Good point. Updated to check for the value "on".
Note: if this script is unconditionally executed in Bash, the VAR=${VAR:-value} pattern used above can be rewritten
Thank you for the suggestion. Updated to explicitly run with bash and declare the LOAD_BALANCER variable.
.evergreen/integration-tests.sh
Outdated
| @@ -61,6 +61,10 @@ if [ -z "$ORCHESTRATION_FILE" ]; then | |||
| if [ "$SSL" != "nossl" ]; then | |||
| ORCHESTRATION_FILE="${ORCHESTRATION_FILE}-ssl" | |||
| fi | |||
|
|
|||
| if [ -n "$LOAD_BALANCER" ]; then | |||
There was a problem hiding this comment.
Agreed; suggest using same pattern as $IPV4_ONLY check above:
if [ "$LOAD_BALANCER" = "on" ]; thenAlso suggest adding LOAD_BALANCER=${LOAD_BALANCER:-off} above to document script parameters and default behavior.
Note: if this script is unconditionally executed in Bash, the VAR=${VAR:-value} pattern used above can be rewritten as:
: "${VAR:=value}"
Summary
mongoc_global_mock_service_id.Resolves CDRIVER-4275 and CDRIVER-4387.
Background & Motivation
integration-tests.shand orchestration configs have been updated for load balancer support. The orchestration configs were added in mongodb-labs/drivers-evergreen-tools#183 and later updated in mongodb-labs/drivers-evergreen-tools#186.The C driver maintains a modified copy of the drivers-evergreen-tools script
run-orchestration.shasintegration-tests.sh.integration-tests.shmay be removed in CDRIVER-4029.The JSON tests in
src/libmongoc/tests/json/initial_seedlist_dns_discovery/load-balancedwere updated to account for mongodb/specifications#1148.Here is a full patch build: https://spruce.mongodb.com/version/6390ffd0850e613823e658de