-
Notifications
You must be signed in to change notification settings - Fork 1.1k
PYTHON-3088 [v3.13] Update load balancer tests to support dedicated load balancer port #870
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
(cherry picked from commit 44853ea)
…es (mongodb#807) (cherry picked from commit 70f7fe7)
…ncer port (mongodb#866) (cherry picked from commit 341d489)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
.evergreen/config.yml
Outdated
@@ -1770,8 +1772,12 @@ tasks: | |||
commands: | |||
- func: "bootstrap mongo-orchestration" | |||
vars: | |||
VERSION: "latest" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
VERSION should not be here. The VERSION gets set in the matrix here:
- matrix_name: "load-balancer"
matrix_spec:
platform: ubuntu-18.04
mongodb-version: ["5.0", "latest"] <---------- VERSION set here
auth-ssl: "*"
...
We'll need to fix this in master and v4.0 as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We also need to change "5.0" to "rapid". We can no longer test load-balancer support against 5.0. The only reason the test passed is because the above bug makes it so that the "5.0" test are actually using "latest".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.
pymongo/pool.py
Outdated
if self.opts.load_balanced and _MOCK_SERVICE_ID: | ||
process_id = doc.get('topologyVersion', {}).get('processId') | ||
doc.setdefault('serviceId', process_id) | ||
doc = self.command("admin", cmd, publish_events=False, exhaust_allowed=awaitable) | ||
if not self.opts.load_balanced: | ||
doc.pop('serviceId', None) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be removed now too?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done. And removed another occurrence.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this PR supposed to be merging into the v3.12 branch or v3.13? The title says v3.13 but the branch is v3.12
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh I see, we still need to add "rapid" as a choice for the "mongodb-version" axes.
.evergreen/config.yml
Outdated
- func: "run load-balancer" | ||
vars: | ||
LOAD_BALANCER: true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think vars/LOAD_BALANCER is needed for "run load-balancer".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LOAD_BALANCER is not needed for "run tests" either is it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The ticket states
Drivers must set the LOAD_BALANCER environment variable to "true" in their load balancer test runs and pass the environment variable when invoking run-orchestration.sh.
Which I interpreted as requiring us to set it to true for the test run as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LOAD_BALANCER is only needed for run-orchestration.sh. Let's remove it here. Note we can also remove the export LOAD_BALANCER=1
line above.
.evergreen/config.yml
Outdated
- func: "run load-balancer" | ||
vars: | ||
LOAD_BALANCER: true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LOAD_BALANCER is not needed for "run tests" either is it?
.evergreen/config.yml
Outdated
- func: "run load-balancer" | ||
vars: | ||
LOAD_BALANCER: true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LOAD_BALANCER is only needed for run-orchestration.sh. Let's remove it here. Note we can also remove the export LOAD_BALANCER=1
line above.
…oad balancer port (mongodb#870) PYTHON-3088 Update load balancer tests to support dedicated load balancer port (mongodb#866) (cherry picked from commit 341d489) (cherry picked from commit 1443d76)
PYTHON-3088 [v3.13] Update load balancer tests to support dedicated load balancer port (#870) (cherry picked from commit 1443d76)
…oad balancer port (mongodb#870) (cherry picked from commit 341d489)
PYTHON-3088 [v3.13] Update load balancer tests to support dedicated load balancer port (#870) (cherry picked from commit 341d489)
PYTHON-3088 [v3.13] Update load balancer tests to support dedicated load balancer port (mongodb#870) (cherry picked from commit 341d489)
PYTHON-3088 [v3.13] Update load balancer tests to support dedicated load balancer port (mongodb#870) (cherry picked from commit 341d489)
PYTHON-3088 [v3.13] Update load balancer tests to support dedicated load balancer port (mongodb#870) (cherry picked from commit 341d489)
PYTHON-3088 Update load balancer tests to support dedicated load balancer port (#866)
(cherry picked from commit 341d489)