Skip to content

Commit a798d89

Browse files
committed
Merge branch 'master' of github.com:mongodb/mongo-python-driver into PYTHON-4878
2 parents a8042a9 + 79033bc commit a798d89

File tree

5 files changed

+936
-7
lines changed

5 files changed

+936
-7
lines changed

pymongo/network_layer.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ async def _async_sendall_ssl(
205205
total_sent += sent
206206

207207
async def _async_receive_ssl(
208-
conn: _sslConn, length: int, dummy: AbstractEventLoop
208+
conn: _sslConn, length: int, dummy: AbstractEventLoop, once: Optional[bool] = False
209209
) -> memoryview:
210210
mv = memoryview(bytearray(length))
211211
total_read = 0
@@ -215,6 +215,9 @@ async def _async_receive_ssl(
215215
while total_read < length:
216216
try:
217217
read = conn.recv_into(mv[total_read:])
218+
# KMS responses update their expected size after the first batch, stop reading after one loop
219+
if once:
220+
return mv[:read]
218221
if read == 0:
219222
raise OSError("connection closed")
220223
except BLOCKING_IO_ERRORS:

test/server_selection_logging/operation-id.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
}
198198
},
199199
{
200-
"level": "info",
200+
"level": "debug",
201201
"component": "serverSelection",
202202
"data": {
203203
"message": "Waiting for suitable server to become available",
@@ -383,7 +383,7 @@
383383
}
384384
},
385385
{
386-
"level": "info",
386+
"level": "debug",
387387
"component": "serverSelection",
388388
"data": {
389389
"message": "Waiting for suitable server to become available",

test/server_selection_logging/replica-set.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
}
185185
},
186186
{
187-
"level": "info",
187+
"level": "debug",
188188
"component": "serverSelection",
189189
"data": {
190190
"message": "Waiting for suitable server to become available",

test/server_selection_logging/sharded.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
}
194194
},
195195
{
196-
"level": "info",
196+
"level": "debug",
197197
"component": "serverSelection",
198198
"data": {
199199
"message": "Waiting for suitable server to become available",

0 commit comments

Comments
 (0)