Resync master again

NoahStapp · NoahStapp · commit 290ebf312df3 · 2024-06-03T16:51:40.000-07:00
diff --git a/doc/changelog.rst b/doc/changelog.rst
@@ -17,6 +17,7 @@ Version 4.7.3 has further fixes for lazily loading modules.
 
 - Use deferred imports instead of importlib lazy module loading.
 - Improve import time on Windows.
+- Reduce verbosity of "Waiting for suitable server to become available" log message from info to debug.
 
 Issues Resolved
 ...............
diff --git a/pymongo/asynchronous/topology.py b/pymongo/asynchronous/topology.py
@@ -34,7 +34,6 @@
 from pymongo.asynchronous.logger import (
     _SERVER_SELECTION_LOGGER,
     _debug_log,
-    _info_log,
     _ServerSelectionStatusMessage,
 )
 from pymongo.asynchronous.monitor import SrvMonitor
@@ -308,7 +307,7 @@ async def _select_servers_loop(
                 )
 
             if not logged_waiting:
-                _info_log(
+                _debug_log(
                     _SERVER_SELECTION_LOGGER,
                     message=_ServerSelectionStatusMessage.WAITING,
                     selector=selector,
diff --git a/pymongo/synchronous/topology.py b/pymongo/synchronous/topology.py
@@ -45,7 +45,6 @@
 from pymongo.synchronous.logger import (
     _SERVER_SELECTION_LOGGER,
     _debug_log,
-    _info_log,
     _ServerSelectionStatusMessage,
 )
 from pymongo.synchronous.monitor import SrvMonitor
@@ -308,7 +307,7 @@ def _select_servers_loop(
                 )
 
             if not logged_waiting:
-                _info_log(
+                _debug_log(
                     _SERVER_SELECTION_LOGGER,
                     message=_ServerSelectionStatusMessage.WAITING,
                     selector=selector,
diff --git a/test/server_selection_logging/operation-id.json b/test/server_selection_logging/operation-id.json
@@ -194,7 +194,7 @@
               }
             },
             {
-              "level": "info",
+              "level": "debug",
               "component": "serverSelection",
               "data": {
                 "message": "Waiting for suitable server to become available",
diff --git a/test/server_selection_logging/replica-set.json b/test/server_selection_logging/replica-set.json
@@ -184,7 +184,7 @@
               }
             },
             {
-              "level": "info",
+              "level": "debug",
               "component": "serverSelection",
               "data": {
                 "message": "Waiting for suitable server to become available",
diff --git a/test/server_selection_logging/sharded.json b/test/server_selection_logging/sharded.json
@@ -193,7 +193,7 @@
               }
             },
             {
-              "level": "info",
+              "level": "debug",
               "component": "serverSelection",
               "data": {
                 "message": "Waiting for suitable server to become available",
diff --git a/test/server_selection_logging/standalone.json b/test/server_selection_logging/standalone.json
@@ -211,7 +211,7 @@
               }
             },
             {
-              "level": "info",
+              "level": "debug",
               "component": "serverSelection",
               "data": {
                 "message": "Waiting for suitable server to become available",

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@`
`194`	`194`	`}`
`195`	`195`	`},`
`196`	`196`	`{`
`197`		`- "level": "info",`
	`197`	`+ "level": "debug",`
`198`	`198`	`"component": "serverSelection",`
`199`	`199`	`"data": {`
`200`	`200`	`"message": "Waiting for suitable server to become available",`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@`
`184`	`184`	`}`
`185`	`185`	`},`
`186`	`186`	`{`
`187`		`- "level": "info",`
	`187`	`+ "level": "debug",`
`188`	`188`	`"component": "serverSelection",`
`189`	`189`	`"data": {`
`190`	`190`	`"message": "Waiting for suitable server to become available",`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@`
`193`	`193`	`}`
`194`	`194`	`},`
`195`	`195`	`{`
`196`		`- "level": "info",`
	`196`	`+ "level": "debug",`
`197`	`197`	`"component": "serverSelection",`
`198`	`198`	`"data": {`
`199`	`199`	`"message": "Waiting for suitable server to become available",`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@`
`211`	`211`	`}`
`212`	`212`	`},`
`213`	`213`	`{`
`214`		`- "level": "info",`
	`214`	`+ "level": "debug",`
`215`	`215`	`"component": "serverSelection",`
`216`	`216`	`"data": {`
`217`	`217`	`"message": "Waiting for suitable server to become available",`