realizing condition needs to be reverted too

Author: sleepyStick

pymongo/asynchronous/topology.py

@@ -16,7 +16,6 @@
 
 from __future__ import annotations
 
-import asyncio
 import logging
 import os
 import queue
@@ -355,15 +354,7 @@ async def _select_servers_loop(
             # change, or for a timeout. We won't miss any changes that
             # came after our most recent apply_selector call, since we've
             # held the lock until now.
-            if _IS_SYNC:
-                await self._condition.wait(common.MIN_HEARTBEAT_INTERVAL)
-            else:
-                try:
-                    await asyncio.wait_for(
-                        self._condition.wait(), common.MIN_HEARTBEAT_INTERVAL
-                    )  # type-ignore: [arg-type]
-                except asyncio.TimeoutError:
-                    pass
+            await self._condition.wait(common.MIN_HEARTBEAT_INTERVAL)
             self._description.check_compatible()
             now = time.monotonic()
             server_descriptions = self._description.apply_selector(
@@ -663,15 +654,15 @@ async def request_check_all(self, wait_time: int = 5) -> None:
         """Wake all monitors, wait for at least one to check its server."""
         async with self._lock:
             self._request_check_all()
-            if _IS_SYNC:
-                await self._condition.wait(wait_time)
-            else:
-                try:
-                    await asyncio.wait_for(
-                        self._condition.wait(), wait_time
-                    )  # type-ignore: [arg-type]
-                except asyncio.TimeoutError:
-                    pass
+            # if _IS_SYNC:
+            await self._condition.wait(wait_time)
+            # else:
+            #     try:
+            #         await asyncio.wait_for(
+            #             self._condition.wait(), wait_time
+            #         )  # type-ignore: [arg-type]
+            #     except asyncio.TimeoutError:
+            #         pass
 
     def data_bearing_servers(self) -> list[ServerDescription]:
         """Return a list of all data-bearing servers.

pymongo/synchronous/topology.py

@@ -16,7 +16,6 @@
 
 from __future__ import annotations
 
-import asyncio
 import logging
 import os
 import queue
@@ -355,15 +354,7 @@ def _select_servers_loop(
             # change, or for a timeout. We won't miss any changes that
             # came after our most recent apply_selector call, since we've
             # held the lock until now.
-            if _IS_SYNC:
-                self._condition.wait(common.MIN_HEARTBEAT_INTERVAL)
-            else:
-                try:
-                    asyncio.wait_for(
-                        self._condition.wait(), common.MIN_HEARTBEAT_INTERVAL
-                    )  # type-ignore: [arg-type]
-                except asyncio.TimeoutError:
-                    pass
+            self._condition.wait(common.MIN_HEARTBEAT_INTERVAL)
             self._description.check_compatible()
             now = time.monotonic()
             server_descriptions = self._description.apply_selector(
@@ -661,13 +652,15 @@ def request_check_all(self, wait_time: int = 5) -> None:
         """Wake all monitors, wait for at least one to check its server."""
         with self._lock:
             self._request_check_all()
-            if _IS_SYNC:
-                self._condition.wait(wait_time)
-            else:
-                try:
-                    asyncio.wait_for(self._condition.wait(), wait_time)  # type-ignore: [arg-type]
-                except asyncio.TimeoutError:
-                    pass
+            # if _IS_SYNC:
+            self._condition.wait(wait_time)
+            # else:
+            #     try:
+            #         asyncio.wait_for(
+            #             self._condition.wait(), wait_time
+            #         )  # type-ignore: [arg-type]
+            #     except asyncio.TimeoutError:
+            #         pass
 
     def data_bearing_servers(self) -> list[ServerDescription]:
         """Return a list of all data-bearing servers.