-
Notifications
You must be signed in to change notification settings - Fork 1.1k
PYTHON-5089 Convert test.test_mongos_load_balancing to async #2107
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
Changes from 4 commits
ff0d5dc
690dcf7
988663f
4b8f936
5cd8be8
499fe42
41d2aab
3c7c2cb
5cd7d02
8b3f1a9
b0c878c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,223 @@ | ||||||
# Copyright 2015-present MongoDB, Inc. | ||||||
# | ||||||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||||||
# you may not use this file except in compliance with the License. | ||||||
# You may obtain a copy of the License at | ||||||
# | ||||||
# http://www.apache.org/licenses/LICENSE-2.0 | ||||||
# | ||||||
# Unless required by applicable law or agreed to in writing, software | ||||||
# distributed under the License is distributed on an "AS IS" BASIS, | ||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||||
# See the License for the specific language governing permissions and | ||||||
# limitations under the License. | ||||||
|
||||||
"""Test AsyncMongoClient's mongos load balancing using a mock.""" | ||||||
from __future__ import annotations | ||||||
|
||||||
import asyncio | ||||||
import sys | ||||||
import threading | ||||||
|
||||||
from pymongo.operations import _Op | ||||||
|
||||||
sys.path[0:0] = [""] | ||||||
|
||||||
from test.asynchronous import AsyncMockClientTest, async_client_context, connected, unittest | ||||||
from test.asynchronous.pymongo_mocks import AsyncMockClient | ||||||
from test.utils import async_wait_until | ||||||
|
||||||
from pymongo.errors import AutoReconnect, InvalidOperation | ||||||
from pymongo.server_selectors import writable_server_selector | ||||||
from pymongo.topology_description import TOPOLOGY_TYPE | ||||||
|
||||||
_IS_SYNC = False | ||||||
|
||||||
|
||||||
@async_client_context.require_connection | ||||||
@async_client_context.require_no_load_balancer | ||||||
def asyncSetUpModule(): | ||||||
pass | ||||||
|
||||||
|
||||||
if not _IS_SYNC: | ||||||
|
||||||
|
||||||
class SimpleOp: | ||||||
def __init__(self, client): | ||||||
self.task: asyncio.Task | ||||||
|
self.task: asyncio.Task | |
self.task: asyncio.Task = 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.
hmmm I don't love that because it'd mess with the type of self.task
(specifically it'd have to be Optional[asyncio.Task]
) in the interest of not making it optional, I moved the assignment from start()
to the init. Does that work? Is that better?
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.
Can you show what you mean exactly?
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 thought I committed and pushed HAHA sorry about that actually pushed now)
Outdated
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.
What do you think about using tasks
here instead of threads
?
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 like it / wanted to do it but noticed that it'd result in the sync version of the file to be tasks
, would I need to modify synchro to change tasks
to threads
to get this to work?
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'd need to have it only do so within test files and with a specific token set to not also change things that happen to be called threads but aren't what we want to synchro.
I'd rather have concurrent executors always be called tasks
for consistency rather than have them be called threads
in the async code.
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.
makes sense, its tasks now :)
Outdated
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.
Can we use ConcurrentRunner
for these as well?
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,6 +15,7 @@ | |
"""Test MongoClient's mongos load balancing using a mock.""" | ||
from __future__ import annotations | ||
|
||
import asyncio | ||
import sys | ||
import threading | ||
|
||
|
@@ -30,22 +31,43 @@ | |
from pymongo.server_selectors import writable_server_selector | ||
from pymongo.topology_description import TOPOLOGY_TYPE | ||
|
||
_IS_SYNC = True | ||
|
||
|
||
@client_context.require_connection | ||
@client_context.require_no_load_balancer | ||
def setUpModule(): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We can keep these to improve performance when skipping this test suite. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I moved it to the class's There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oh whoops my bad, forgot how the wrappers interact with async. You're right! There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. All good, wasn't sure if I was missing / forgetting what the trick was! |
||
pass | ||
|
||
|
||
class SimpleOp(threading.Thread): | ||
def __init__(self, client): | ||
super().__init__() | ||
self.client = client | ||
self.passed = False | ||
if not _IS_SYNC: | ||
|
||
class SimpleOp: | ||
def __init__(self, client): | ||
self.task: asyncio.Task | ||
self.client = client | ||
self.passed = False | ||
|
||
def run(self): | ||
self.client.db.command("ping") | ||
self.passed = True # No exception raised. | ||
|
||
def start(self): | ||
self.task = asyncio.create_task(self.run()) | ||
|
||
def run(self): | ||
self.client.db.command("ping") | ||
self.passed = True # No exception raised. | ||
def join(self): | ||
self.task | ||
else: | ||
|
||
class SimpleOp(threading.Thread): | ||
def __init__(self, client): | ||
super().__init__() | ||
self.client = client | ||
self.passed = False | ||
|
||
def run(self): | ||
self.client.db.command("ping") | ||
self.passed = True # No exception raised. | ||
|
||
|
||
|
||
def do_simple_op(client, nthreads): | ||
|
@@ -118,12 +140,17 @@ def f(): | |
|
||
passed.append(True) | ||
|
||
threads = [threading.Thread(target=f) for _ in range(nthreads)] | ||
for t in threads: | ||
t.start() | ||
if _IS_SYNC: | ||
threads = [threading.Thread(target=f) for _ in range(nthreads)] | ||
for t in threads: | ||
t.start() | ||
|
||
for t in threads: | ||
t.join() | ||
for t in threads: | ||
t.join() | ||
else: | ||
tasks = [asyncio.create_task(f()) for _ in range(nthreads)] | ||
for t in tasks: | ||
t | ||
|
||
self.assertEqual(nthreads, len(passed)) | ||
|
||
|
@@ -183,8 +210,11 @@ def test_load_balancing(self): | |
client.mock_rtts["a:1"] = 0.045 | ||
|
||
# Discover only b is within latency window. | ||
def predicate(): | ||
return {("b", 2)} == writable_addresses(topology) | ||
|
||
wait_until( | ||
lambda: {("b", 2)} == writable_addresses(topology), | ||
predicate, | ||
'discover server "a" is too far', | ||
) | ||
|
||
|
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.
Sadly there isn't an async version of
unittest.setUpModule
. I'd just add these decorators to anasyncSetUp
method forTestMongosLoadBalancing
instead since it's the only test class in this file.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.
Ah good to know, makes sense